TMT: Initial enablement

This PR will enable test runs using TMT. These tests can be maintained here for starters and fetched and reused in the podman rpm for toolbox tests on bodhi updates. https://src.fedoraproject.org/rpms/toolbox/pull-request/24 (cherry picked from commit 0cbcff3ba4)
Update to 0.1.1
2025-01-31 18:33:03 +05:30 · 2024-11-05 15:06:13 +01:00 · 2024-10-18 16:33:13 +02:00 · 2024-10-18 16:32:44 +02:00 · 2024-10-18 16:31:33 +02:00 · 2024-10-18 16:31:33 +02:00
10 changed files with 75 additions and 107 deletions
--- a/.gitignore
+++ b/.gitignore
@ -32,8 +32,4 @@
 /toolbox-0.0.99.4-vendored.tar.xz
 /toolbox-0.0.99.5-vendored.tar.xz
 /toolbox-0.0.99.6-vendored.tar.xz
-/toolbox-0.1.0-vendored.tar.xz
 /toolbox-0.1.1-vendored.tar.xz
-/toolbox-0.1.2-vendored.tar.xz
-/toolbox-0.2-vendored.tar.xz
-/toolbox-0.3-vendored.tar.xz
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (toolbox-0.3-vendored.tar.xz) = e464aba1c40b37b0ed027a560a0685e5dc8f07684d33d0e2bac5f0ba8c2b2c2a4c585db8847b23bd0753e33d37e3e88c87ab71d3999c3afedf315717f468c0ba
+SHA512 (toolbox-0.1.1-vendored.tar.xz) = dc3aa19f504de49addfe85fa800a0e553c65292cf0d48bca60946251fb8d7ba8bc53c9411a7db5f83f1d256ec960b0f22d2d5798f022be5b704c2bf3531f4ba1
--- a/tests/main.fmf
+++ b/tests/main.fmf
@ -6,7 +6,5 @@ require:

 /rootless:
    summary: rootless test
-    test: |
-        rpm --erase p11-kit-server
-        bash ./rootless-test.sh
-    duration: 4h
+    test: bash ./rootless-test.sh
+    duration: 120m
--- a/tests/tmt-envvars
+++ b/tests/tmt-envvars
@ -1 +1,18 @@
+TMT_TREE
+TMT_PLAN_DATA
+TMT_VERSION
+TMT_TEST_NAME
+TMT_TEST_DATA
+TMT_TEST_SERIAL_NUMBER
+TMT_TEST_ITERATION_ID
+TMT_TEST_METADATA
+TMT_SOURCE_DIR
+TMT_REBOOT_COUNT
+TMT_TEST_RESTART_COUNT
+TMT_TOPOLOGY_BASH
+TMT_TOPOLOGY_YAML
+TMT_TEST_PIDFILE
+TMT_TEST_PIDFILE_LOCK
+TMT_TEST_PIDFILE_ROOT
+ROOTLESS_USER
 TMPDIR
--- a/toolbox-Add-migration-paths-for-coreos-toolbox-users.patch
+++ b/toolbox-Add-migration-paths-for-coreos-toolbox-users.patch
@ -1,4 +1,4 @@
-From 4649e50c28321185cbaa81a37efbd317b84ae840 Mon Sep 17 00:00:00 2001
+From c25ad44b7cb50d470b1533931b7808cc194f0d50 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <rishi@fedoraproject.org>
 Date: Wed, 18 Aug 2021 17:55:21 +0200
 Subject: [PATCH 1/2] cmd/run: Make sosreport work by setting the HOST
@ -10,10 +10,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1940037
 1 file changed, 1 insertion(+)

 diff --git a/src/cmd/run.go b/src/cmd/run.go
-index ceb277a3640a..72b673f506b3 100644
+index 719c0d6abb20..92a097283f38 100644
 --- a/src/cmd/run.go
 +++ b/src/cmd/run.go
-@@ -576,6 +576,7 @@ func constructExecArgs(container, preserveFDs string,
+@@ -566,6 +566,7 @@ func constructExecArgs(container, preserveFDs string,
 	execArgs = append(execArgs, envOptions...)
 
 	execArgs = append(execArgs, []string{
@ -22,10 +22,10 @@ index ceb277a3640a..72b673f506b3 100644
 		"--preserve-fds", preserveFDs,
 	}...)
 -- 
-2.51.0
+2.46.1


-From b2ba8445bee988143d546bc15fa3a8a8c019aa2e Mon Sep 17 00:00:00 2001
+From e7877a4d1d38dc35aa6da6c012ec9a23397b7aa4 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <rishi@fedoraproject.org>
 Date: Fri, 10 Dec 2021 13:42:15 +0100
 Subject: [PATCH 2/2] test/system: Update to test the migration path for
@ -42,10 +42,10 @@ ca899c8a561f357ae32c6ba6813520fd8b682abb and the parts of commit
 create mode 100644 test/system/100-root.bats

 diff --git a/test/system/002-help.bats b/test/system/002-help.bats
-index f7cd3f5480ab..7ad5f72e792f 100644
+index a8bfbc2c79d2..5dd14025ea0b 100644
 --- a/test/system/002-help.bats
 +++ b/test/system/002-help.bats
-@@ -33,20 +33,6 @@ teardown_file() {
+@@ -33,20 +33,6 @@ teardown() {
   cleanup_all
 }
 
@ -100,5 +100,5 @@ index 000000000000..cf35d60ac25c
 +  skip "Testing of entering toolboxes is not implemented"
 +}
 -- 
-2.51.0
+2.46.1

--- a/toolbox-Make-the-build-flags-match-Fedora.patch
+++ b/toolbox-Make-the-build-flags-match-Fedora.patch
@ -1,26 +1,11 @@
-From a1bb7d53fab70899c991feb9276cf93a12280750 Mon Sep 17 00:00:00 2001
+From 7dc70160c8ff531473004e879dd57ec303789d71 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <rishi@fedoraproject.org>
 Date: Mon, 29 Jun 2020 17:57:47 +0200
 Subject: [PATCH] build: Make the build flags match Fedora's %{gobuildflags}

-These reflect the defaults for Fedora 39, which is the oldest supported
-Fedora, barring some exceptions mentioned below.
-
-The change to use the RPM's %{name}, %{version}, %{release} and the
-SOURCE_DATE_EPOCH environment variable [1], instead of /dev/urandom, to
-generate the build ID annotation for the toolbox(1) binary [2] was left
-out.  It will need more work to propagate the RPM's %{name}, %{version}
-and %{release} to Meson.
-
 Note that these flags are meant for every CPU architecture other than
 PPC64, and should be kept updated to match Fedora's Go guidelines. Use
 'rpm --eval "%{gobuildflags}"' to expand the %{gobuildflags} macro.
-
-[1] https://reproducible-builds.org/docs/source-date-epoch/
-
-[2] go-rpm-macros commit 1980932bf3a21890
-    https://pagure.io/go-rpm-macros/c/1980932bf3a21890
-    https://fedoraproject.org/wiki/Changes/ReproduciblePackageBuilds
 ---
 src/go-build-wrapper | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
@ -58,5 +43,5 @@ index a5a1a6a508fb..5978422e9aed 100755
 
 exit "$?"
 -- 
-2.51.0
+2.46.1

--- a/toolbox-Make-the-build-flags-match-RHEL-10.patch
+++ b/toolbox-Make-the-build-flags-match-RHEL-10.patch
@ -1,4 +1,4 @@
-From f79f96fb8f3ec528952b9719f356e871837987df Mon Sep 17 00:00:00 2001
+From f08f64c0d5f2019055381c3c00426fe8545e5e31 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <rishi@fedoraproject.org>
 Date: Mon, 29 Jun 2020 17:57:47 +0200
 Subject: [PATCH] build: Make the build flags match RHEL 10's %{gobuildflags}
@ -67,5 +67,5 @@ index a5a1a6a508fb..5978422e9aed 100755
 
 exit "$?"
 -- 
-2.51.0
+2.46.1

--- a/toolbox-Make-the-build-flags-match-RHEL-9.patch
+++ b/toolbox-Make-the-build-flags-match-RHEL-9.patch
@ -1,4 +1,4 @@
-From 2d1b4b2492c65abd0d0bf0c71c971f550447412d Mon Sep 17 00:00:00 2001
+From ff1320fa869f1e4952836436ab2ad928cbba0987 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <rishi@fedoraproject.org>
 Date: Mon, 29 Jun 2020 17:57:47 +0200
 Subject: [PATCH] build: Make the build flags match RHEL 9's %{gobuildflags}
@ -46,5 +46,5 @@ index a5a1a6a508fb..0a2c7526f210 100755
 
 exit "$?"
 -- 
-2.51.0
+2.46.1

--- a/toolbox.rpmlintrc
+++ b/toolbox.rpmlintrc
@ -1 +0,0 @@
-addFilter(r'no-%check-section')
--- a/toolbox.spec
+++ b/toolbox.spec
@ -1,16 +1,7 @@
 %global __brp_check_rpaths %{nil}

-%if 0%{?rhel}
-%if 0%{?rhel} <= 9
-%{!?bash_completions_dir: %global bash_completions_dir %{_datadir}/bash-completion/completions}
-%{!?fish_completions_dir: %global fish_completions_dir %{_datadir}/fish/vendor_completions.d}
-%{!?zsh_completions_dir: %global zsh_completions_dir %{_datadir}/zsh/site-functions}
-%endif
-%endif
-
-
 Name:          toolbox
-Version:       0.3
+Version:       0.1.1

 %global goipath github.com/containers/%{name}

@ -26,10 +17,10 @@ Version:       0.3
 %endif
 %endif

-%global toolbx_go 1.22
+%global toolbx_go 1.20

 %if 0%{?fedora}
-%global toolbx_go 1.24.7
+%global toolbx_go 1.22.7
 %endif

 %if 0%{?rhel}
@ -38,11 +29,11 @@ Version:       0.3
 %elif 0%{?rhel} == 10
 %global toolbx_go 1.22.5
 %elif 0%{?rhel} > 10
-%global toolbx_go 1.24.4
+%global toolbx_go 1.23.1
 %endif
 %endif

-Release:       2%{?dist}
+Release:       1%{?dist}
 Summary:       Tool for interactive command line environments on Linux

 License:       Apache-2.0
@ -65,26 +56,43 @@ BuildRequires: go-md2man
 BuildRequires: golang >= %{toolbx_go}
 BuildRequires: meson >= 0.58.0
 BuildRequires: pkgconfig(bash-completion)
-BuildRequires: shadow-utils-subid-devel >= 4.16.0
+BuildRequires: shadow-utils-subid-devel
 BuildRequires: systemd
 BuildRequires: systemd-rpm-macros
 %if ! 0%{?rhel}
+BuildRequires: golang(github.com/HarryMichal/go-version) >= 1.0.1
+BuildRequires: golang-ipath(github.com/NVIDIA/go-nvlib) >= 0.6.1
+BuildRequires: golang-ipath(github.com/NVIDIA/go-nvml) >= 0.12.4.0
+BuildRequires: golang-ipath(github.com/NVIDIA/nvidia-container-toolkit) >= 1.16.2
+BuildRequires: golang(github.com/acobaugh/osrelease) >= 0.1.0
+BuildRequires: golang(github.com/briandowns/spinner) >= 1.18.0
+BuildRequires: golang(github.com/docker/go-units) >= 0.5.0
+BuildRequires: golang(github.com/fsnotify/fsnotify) >= 1.7.0
+BuildRequires: golang(github.com/go-logfmt/logfmt) >= 0.5.0
+BuildRequires: golang(github.com/godbus/dbus) >= 5.0.6
+BuildRequires: golang(github.com/google/renameio/v2) >= 2.0.0
+BuildRequires: golang(github.com/sirupsen/logrus) >= 1.9.3
+BuildRequires: golang(github.com/spf13/cobra) >= 1.3.0
+BuildRequires: golang(github.com/spf13/viper) >= 1.10.1
+BuildRequires: golang-ipath(golang.org/x/sys) >= 0.24.0
+BuildRequires: golang(golang.org/x/text) >= 0.3.8
+BuildRequires: golang-ipath(gopkg.in/yaml.v3) >= 3.0.1
+BuildRequires: golang-ipath(tags.cncf.io/container-device-interface) >= 0.8.0
 BuildRequires: pkgconfig(fish)
 # for tests
 # BuildRequires: codespell
+# BuildRequires: golang(github.com/stretchr/testify) >= 1.9.0
 # BuildRequires: ShellCheck
 %endif

-Recommends:    p11-kit-server
 Recommends:    skopeo
-%if ! 0%{?rhel}
-Recommends:    fuse-overlayfs
-%endif

 Requires:      containers-common
-Requires:      flatpak-session-helper
 Requires:      podman >= 1.6.4
-Requires:      shadow-utils-subid%{?_isa} >= 4.16.0
+Requires:      shadow-utils-subid%{?_isa}
+%if ! 0%{?rhel}
+Requires:      flatpak-session-helper
+%endif


 %description
@ -143,22 +151,24 @@ The %{name}-tests package contains system tests for %{name}.
 %endif
 %endif

-%gomkdir -s %{_builddir}/%{extractdir}/src -k
+%gomkdir -s %{_builddir}/%{extractdir}/src %{?rhel:-k}


 %build
+export %{gomodulesmode}
+export GOPATH=%{gobuilddir}:%{gopath}
 export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"

 %meson \
 %if 0%{?rhel}
-    -Dfish_completions_dir=%{fish_completions_dir} \
+    -Dfish_completions_dir=%{_datadir}/fish/vendor_completions.d \
 %if 0%{?rhel} <= 9
    -Dmigration_path_for_coreos_toolbox=true \
 %endif
 %endif
    -Dprofile_dir=%{_sysconfdir}/profile.d \
    -Dtmpfiles_dir=%{_tmpfilesdir} \
-    -Dzsh_completions_dir=%{zsh_completions_dir}
+    -Dzsh_completions_dir=%{_datadir}/zsh/site-functions

 %meson_build

@ -179,17 +189,17 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf

 %files
 %doc CODE-OF-CONDUCT.md CONTRIBUTING.md GOALS.md NEWS README.md SECURITY.md
-%license COPYING src/vendor/modules.txt
+%license COPYING %{?rhel:src/vendor/modules.txt}
 %{_bindir}/%{name}
+%{_datadir}/bash-completion
+%{_datadir}/fish
+%{_datadir}/zsh
 %{_mandir}/man1/%{name}.1*
 %{_mandir}/man1/%{name}-*.1*
 %{_mandir}/man5/%{name}.conf.5*
 %config(noreplace) %{_sysconfdir}/containers/%{name}.conf
 %{_sysconfdir}/profile.d/%{name}.sh
 %{_tmpfilesdir}/%{name}.conf
-%{bash_completions_dir}/%{name}.bash
-%{fish_completions_dir}/%{name}.fish
-%{zsh_completions_dir}/_%{name}


 %files tests
@ -197,40 +207,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf


 %changelog
-* Fri Oct 10 2025 Alejandro Sáez <asm@redhat.com> - 0.3-2
- rebuild
-
-* Wed Sep 17 2025 Debarshi Ray <rishi@fedoraproject.org> - 0.3-1
- Update to 0.3
-
-* Fri Aug 15 2025 Maxwell G <maxwell@gtmx.me> - 0.2-2
- Rebuild for golang-1.25.0
-
-* Sat Aug 09 2025 Debarshi Ray <rishi@fedoraproject.org> - 0.2-1
- Update to 0.2
- Fix CVE-2025-23266, CVE-2025-23267, and GHSA-fv92-fjc5-jj9h or GO-2025-3787
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Jun 03 2025 Debarshi Ray <rishi@fedoraproject.org> - 0.1.2-1
- Update to 0.1.2
-
-* Wed Jan 22 2025 Debarshi Ray <rishi@fedoraproject.org> - 0.1.1-3
- Use RPM macros for shell completions and clean up directory ownership
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
 * Mon Nov 04 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.1.1-1
 - Update to 0.1.1

-* Tue Oct 22 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.1.0-1
- Update to 0.1.0
-
-* Wed Oct 16 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.6-6
- Recommend fuse-overlayfs because old containers created with it need it
-
 * Mon Oct 07 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.6-5
 - Don't use slirp4netns(1) in tests to work around bug in pasta(1)

@ -246,21 +225,15 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 * Mon Sep 30 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.6-1
 - Update to 0.0.99.6

-* Thu Sep 12 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-18
- Rebuild against shadow-utils-subid ABI version 5.0.0
-
-* Thu Aug 08 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-17
+* Thu Aug 08 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-16
 - Ensure slirp4netns(1) is installed

-* Wed Jul 31 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-16
+* Wed Jul 31 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-15
 - Avoid running out of storage space when running the tests

-* Fri Jul 26 2024 Adam Williamson <awilliam@redhat.com> - 0.0.99.5-15
+* Fri Jul 26 2024 Adam Williamson <awilliam@redhat.com> - 0.0.99.5-14
 - Fix CI test (hopefully)

-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.99.5-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
 * Thu Jul 11 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-13
 - Silence 'rpminspect --tests=stack-prot'
Author	SHA1	Message	Date
Lokesh Mandvekar	1987259f0d	TMT: Initial enablement This PR will enable test runs using TMT. These tests can be maintained here for starters and fetched and reused in the podman rpm for toolbox tests on bodhi updates. https://src.fedoraproject.org/rpms/toolbox/pull-request/24 (cherry picked from commit `0cbcff3ba4`)	2025-01-31 18:33:03 +05:30
Debarshi Ray	9eec6dad01	Update to 0.1.1 ... and update the BuildRequires on golang to reflect reality. https://bugzilla.redhat.com/show_bug.cgi?id=2323150	2024-11-05 15:06:13 +01:00
Yaakov Selkowitz	7f0528651e	Fix ELN build Otherwise, it fails with: Processing files: toolbox-debugsource-0.0.99.6-5.eln143.x86_64 RPM build errors: error: Empty %files file /builddir/build/BUILD/toolbox-0.0.99.6-build/toolbox-0.0.99.6/debugsourcefiles.list Empty %files file /builddir/build/BUILD/toolbox-0.0.99.6-build/toolbox-0.0.99.6/debugsourcefiles.list Child return code was: 1 https://src.fedoraproject.org/rpms/toolbox/pull-request/23	2024-10-18 16:33:13 +02:00
Debarshi Ray	fe0293100f	Don't use slirp4netns(1) in tests to work around bug in pasta(1)	2024-10-18 16:32:44 +02:00
Debarshi Ray	b14809a6f7	Unify the build with RHEL There's no need to do a build just for this.	2024-10-18 16:31:33 +02:00
Debarshi Ray	5b430e9285	Unify the build with RHEL There's no need to do a build just for this.	2024-10-18 16:31:33 +02:00
Debarshi Ray	24d6aab410	Unify the build with RHEL 9 There's no need to do a build just for this.	2024-10-18 16:31:33 +02:00
Debarshi Ray	0aabe733dc	Add 'Requires: shadow-utils-subid%{?_isa}' The runtime dependency on shadow-utils-subid should have already been part of commit `95d6ea8689` to ensure that Toolbx >= 0.0.99.4 would be able to dlopen(3) the library. It only worked in practice because the podman RPM also required it. There's no need to do a build just for this.	2024-10-18 16:31:08 +02:00
Debarshi Ray	de1b3ad729	Use the fedora-toolbox:40 image for Fedora Asahi Remix hosts https://bugzilla.redhat.com/show_bug.cgi?id=2316312	2024-10-18 16:30:33 +02:00
Debarshi Ray	123a51592c	Unbreak the downstream Fedora CI Fallout from `5871578c75`	2024-10-18 16:30:09 +02:00
Debarshi Ray	905f358a57	Silence 'rpminspect --tests=elf' With Toolbx 0.0.99.6, 'rpminspect --tests=elf', run by the Fedora CI, fails with: /usr/bin/toolbox lost full GNU_RELRO security protection This is because from version 0.0.99.6 onwards, toolbox(1) is only built with the '-z relro' linker flag, but not '-z now' [1]. Fallout from `5871578c75` [1] Upstream commit 83f28c52e47c2d44 `83f28c52e4` https://github.com/containers/toolbox/pull/1548	2024-10-18 16:29:57 +02:00
Debarshi Ray	5871578c75	Update to 0.0.99.6 Start using the golang-ipath(...) virtual Provides for BuildRequires because they use the top-level import paths and are closer to what is listed in the upstream go.mod. The golang(...) virtual Provides mention each individual Go package within a Go module, and bigger modules can have several packages in them. It is noisy and tedious to keep up with the list of packages that are currently in use, by looking at all the Go source files, and then to list them as BuildRequires. Update the compiler and linker flags for Fedora by incorporating some of the changes to the distribution's defaults up to Fedora 39, which is the oldest supported Fedora. Switch to using the GO_BUILDTAGS and GO_LDFLAGS environment variables, because their unprefixed counterparts have been deprecated [1], and start annotating the toolbox(1) binary with an ELF note that identifies the RPM for which it was built [2]. However, the change to use the RPM's %{name}, %{version}, %{release} and the SOURCE_DATE_EPOCH environment variable [3], instead of /dev/urandom, to generate the build ID annotation for the toolbox(1) binary [4] was left out. It will need more work to propagate the RPM's %{name}, %{version} and %{release} to Meson. Stop carrying the downstream patch for the compiler and linker flags for PPC64. The architecture was already discontinued from Fedora 29 [5], even before the patch was added [6]. It was added purely for the sake of completeness, and in the last four years since it was introduced, it hasn't been tested or used. At this point it's becoming too much of a maintenance burden, and removing it silences the %ifarch-applied-patch warning from rpmlint. Fill in some of the missing Requires for the toolbox-tests sub-package. [1] go-rpm-macros commit bc7e5cc55c4709e8 https://pagure.io/go-rpm-macros/c/bc7e5cc55c4709e8 [2] Fedora redhat-rpm-config commit 57edf0cad7b089ed https://src.fedoraproject.org/rpms/redhat-rpm-config/c/57edf0cad7b089ed https://fedoraproject.org/wiki/Changes/Package_information_on_ELF_objects [3] https://reproducible-builds.org/docs/source-date-epoch/ [4] go-rpm-macros commit 1980932bf3a21890 https://pagure.io/go-rpm-macros/c/1980932bf3a21890 https://fedoraproject.org/wiki/Changes/ReproduciblePackageBuilds [5] https://fedoraproject.org/wiki/Changes/DiscontinuePPC64 [6] Commit `ba60453d21` https://src.fedoraproject.org/rpms/toolbox/pull-request/22	2024-09-30 16:39:23 +02:00
Debarshi Ray	7e07901ab7	Unify the build with RHEL There's no need to do a build just for this.	2024-09-30 16:35:38 +02:00
Debarshi Ray	5b11d038bf	tests: Silence deprecation warning Otherwise, Ansible in Fedora CI would complain: # STDERR: ---v---v---v---v---v--- [DEPRECATION WARNING]: "include" is deprecated, use include_tasks/import_tasks instead. See https://docs.ansible.com/ansible-core/2.14/user_guide/playbooks_reuse_includes.html for details. This feature will be removed in version 2.16. Deprecation warnings can be disabled by setting deprecation_warnings=False in ansible.cfg. https://src.fedoraproject.org/rpms/toolbox/pull-request/21	2024-09-30 16:34:57 +02:00
Adam Williamson	edcaf97d53	tests: Ensure slirp4netns(1) is installed Podman 5.0 switched to using pasta(1), instead of slirp4netns(1), by default for rootless containers. This change has led to a regression causing 'skopeo copy' to get stuck uploading an OCI image to the local temporary Docker registry run by the tests as a Podman container [1], which breaks the test suite on Fedora 40 onwards. This was worked around by forcing the use of slirp4netns(1). The slirp4nets package needs to be explicitly installed on Fedora 40 onwards, because the dependency in containers-common-extra changed from Recommends to Suggests [2]. Otherwise, it led to: 1..320 # test suite: Set up # test suite: Tear down not ok 1 setup_suite # (from function `assert_success' in file ./libs/bats-assert/src/assert.bash, line 114, # from function `_setup_docker_registry' in file ./libs/helpers.bash, line 208, # from function `setup_suite' in test file ./setup_suite.bash, line 59) # `_setup_docker_registry' failed # # -- command failed -- # status : 127 # output : Error: could not find slirp4netns, the network namespace can't be configured: exec: "slirp4netns": executable file not found in $PATH # -- # # Untagged: quay.io/toolbox_tests/registry:latest # Deleted: fea5a12cde107bb407bc44ede6dd9edea1d2b4171cd8e52b0cb330bf45e517e1 # bats warning: Executed 1 instead of expected 320 tests The missing dependency on the slirp4netns package in toolbox-tests doesn't affect Podman's downstream Fedora CI, which runs toolbox-tests, because it separately installs slirp4netns for other tests [3]. Fallout from `d8388da39e` [1] https://github.com/containers/podman/issues/22575 [2] Fedora containers-common commit 17934d87b2686ab5 Fedora containers-common commit 13c232f064113860 https://src.fedoraproject.org/rpms/containers-common/c/17934d87b2686ab5 https://src.fedoraproject.org/rpms/containers-common/c/13c232f064113860 [3] Fedora podman commit 9667d0f5b5069acb https://src.fedoraproject.org/rpms/podman/c/9667d0f5b5069acb https://src.fedoraproject.org/rpms/toolbox/pull-request/20 Signed-off-by: Adam Williamson <awilliam@redhat.com>	2024-09-30 16:34:57 +02:00
Adam Williamson	bc955f71cb	tests: Avoid running out of storage space Toolbx's system tests download several images when setting up the test suite, and cache them for later use by the tests [1]. This saves time and avoids hitting rate limits imposed by OCI registries by not downloading the same images repeatedly for several tests, but at the cost of increased use of storage space to cache the images. The images are cached under BATS_TMPDIR. It defaults to the TMPDIR environment variable, and if that's not set then to /tmp [2]. Normally, TMPDIR isn't set, and the images end up getting cached under /tmp. Now, /tmp is typically on tmpfs backed by RAM or swap, which means that it should be used for smaller size-bounded files only, and /var/tmp should be used for everything else [3]. The images are big enough that a collection of them can't be described as smaller and size-bounded, and it led to: 1..306 # test suite: Set up # test suite: Tear down not ok 1 setup_suite # (from function `setup_suite' in test file ./setup_suite.bash, line 55) # `_pull_and_cache_distro_image fedora "$((system_version-1))" \|\| false' failed # Failed to cache image registry.fedoraproject.org/fedora-toolbox:40 to /tmp/bats-run-IPz4Cn/image-cache/fedora-toolbox-40 # time="2024-02-19T11:41:43Z" level=fatal msg="copying system image from manifest list: writing blob: write /tmp/bats-run-IPz4Cn/image-cache/fedora-toolbox-40/dir-put-blob607392514: no space left on device" # bats warning: Executed 1 instead of expected 306 tests So, change the default location of the BATS_TMPDIR environment variable to /var/tmp by setting TMPDIR. [1] Toolbx commit 50683c9d9a78adc9 `50683c9d9a` https://github.com/containers/toolbox/pull/375 [2] https://bats-core.readthedocs.io/en/stable/writing-tests.html [3] https://systemd.io/TEMPORARY_DIRECTORIES/ https://src.fedoraproject.org/rpms/toolbox/pull-request/20 Signed-off-by: Adam Williamson <awilliam@redhat.com>	2024-09-30 16:34:57 +02:00
Adam Williamson	7de60bb59b	tests: Don't use undefined variable The test.environment variable was removed from the variables defined in tests.yml in commit `1b207227f3`, but it's still used, which causes Ansible to break: The task includes an option with an undefined variable. The error was: 'dict object' has no attribute 'environment'. 'dict object' has no attribute 'environment' https://src.fedoraproject.org/rpms/toolbox/pull-request/19	2024-09-30 16:27:08 +02:00