From 21df51160a8d5f80477d38b3593b864075855d40 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 24 Feb 2025 10:43:04 +0000 Subject: [PATCH 01/12] Update to 2.235.0 upstream release Upstream tag: v2.235.0 Upstream commit: c9b3eca0 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 17 ++++++++------ README.packit | 2 +- container-selinux.spec | 4 ++-- gating.yaml | 4 +++- plans/main.fmf | 50 +++++++++++++----------------------------- sources | 2 +- test/Makefile | 16 -------------- test/main.fmf | 14 +++++------- test/podman-tests.sh | 2 +- 10 files changed, 40 insertions(+), 72 deletions(-) delete mode 100644 test/Makefile diff --git a/.gitignore b/.gitignore index 2069158..abf490c 100644 --- a/.gitignore +++ b/.gitignore @@ -232,3 +232,4 @@ /v2.233.0.tar.gz /v2.234.1.tar.gz /v2.234.2.tar.gz +/v2.235.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml index c9b56ad..cc1d83b 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -13,9 +13,11 @@ files_to_sync: - src: plans/ dest: plans/ delete: true + mkpath: true - src: test/ dest: test/ delete: true + mkpath: true - src: .fmf/ dest: .fmf/ delete: true @@ -44,10 +46,8 @@ jobs: enable_net: true # container-selinux is noarch so we only need to test on one arch targets: &fedora_copr_targets - - fedora-development - - fedora-latest - - fedora-ltest-stable - - fedora-40 + - fedora-all-x86_64 + - fedora-all-aarch64 - job: copr_build trigger: pull_request @@ -55,7 +55,8 @@ jobs: notifications: *copr_build_failure_notification enable_net: true targets: - - fedora-eln + - fedora-eln-x86_64 + - fedora-eln-aarch64 - job: copr_build trigger: pull_request @@ -63,8 +64,10 @@ jobs: notifications: *copr_build_failure_notification enable_net: true targets: ¢os_copr_targets - - centos-stream-9 - - centos-stream-10 + - centos-stream-9-x86_64 + - centos-stream-9-aarch64 + - centos-stream-10-x86_64 + - centos-stream-10-aarch64 # Run on commit to main branch # Build targets managed in copr settings diff --git a/README.packit b/README.packit index c18262a..2cdc258 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.103.0. +The file was generated using packit 1.1.1.post1.dev1+g7c5e02df. diff --git a/container-selinux.spec b/container-selinux.spec index e34b6fd..6fd90dd 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -30,12 +30,12 @@ Name: container-selinux %if %{defined copr_build} Epoch: 102 %else -Epoch: 2 +Epoch: 4 %endif # Keep Version in upstream specfile at 0. It will be automatically set # to the correct value by Packit for copr and koji builds. # IGNORE this comment if you're looking at it in dist-git. -Version: 2.234.2 +Version: 2.235.0 Release: %autorelease License: GPL-2.0-only URL: https://github.com/containers/%{name} diff --git a/gating.yaml b/gating.yaml index dbb1d91..8f949e2 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,7 +1,9 @@ --- !Policy product_versions: - fedora-* -decision_context: bodhi_update_push_stable +decision_context: + - bodhi_update_push_stable + - bodhi_update_push_testing rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/plans/main.fmf b/plans/main.fmf index 2e13af5..baa8b2f 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -2,39 +2,19 @@ discover: how: fmf execute: how: tmt -adjust: +prepare: + - when: distro == centos-stream or distro == rhel + how: shell + script: | + dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm + dnf -y config-manager --set-enabled epel + order: 10 - when: initiator == packit - because: "We need to test with updated packages from rhcontainerbot/podman-next copr" - prepare+: - how: shell - script: | - sed -i -n '/^priority=/!p;$apriority=1' /etc/yum.repos.d/*podman-next*.repo - dnf -y upgrade --allowerasing - # FIXME: Use epel10 once bats is available there - - when: distro == centos-stream-10 or distro == rhel-10 - because: "bats isn't yet available on epel10" - prepare+: - how: install - copr: rhcontainerbot/bats-el10 - package: bats - - when: distro == centos-stream-9 or distro == rhel-9 - because: "bats is present on EPEL on rhel9 / c9s" - prepare+: - how: feature - epel: enabled - -/upstream: - summary: Run SELinux specific Podman tests on upstream PRs - discover+: - filter: tag:upstream - adjust+: - - enabled: false - when: initiator is not defined or initiator != packit - -/downstream: - summary: Run SELinux specific Podman tests on bodhi / errata and dist-git PRs - discover+: - filter: tag:downstream - adjust+: - - enabled: false - when: initiator == packit + how: shell + script: | + COPR_REPO_FILE="/etc/yum.repos.d/*podman-next*.repo" + if compgen -G $COPR_REPO_FILE > /dev/null; then + sed -i -n '/^priority=/!p;$apriority=1' $COPR_REPO_FILE + fi + dnf -y upgrade --allowerasing + order: 20 diff --git a/sources b/sources index 1703887..1602c69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.234.2.tar.gz) = 2ec931ca1bf3f62659944389ef9679c6bc283aa001c275ef84e5be0430e79090ec20a993cccd24c4122f7adc3bcf8338489e09b1e5ad548fde1eef840022281c +SHA512 (v2.235.0.tar.gz) = 5d422ffe69e994d2b30460bef39598ccac52d3607a23dd15e300374f1704c6e5883069aa74cb3b362b9545f4dd4e048b6e9893a6086cbba53e9d5f8185b2ffd2 diff --git a/test/Makefile b/test/Makefile deleted file mode 100644 index 9088bd9..0000000 --- a/test/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -.PHONY: basic_check -basic_check: - semodule --list=full | grep container - semodule -B - rpm -Vqf /var/lib/selinux/*/active/modules/200/container - -.PHONY: podman_e2e_test -podman_e2e_test: - bash ./podman-tests.sh e2e - -.PHONY: podman_system_test -podman_system_test: - bash ./podman-tests.sh system - -clean: - rm -rf podman-*dev* podman.spec diff --git a/test/main.fmf b/test/main.fmf index bded6bc..4b186d5 100644 --- a/test/main.fmf +++ b/test/main.fmf @@ -1,19 +1,17 @@ require: + - attr - bats - container-selinux - - cpio - - golang - - make - - podman - podman-tests - policycoreutils /basic_check: - tag: [ upstream, downstream ] summary: Run basic checks - test: make basic_check + test: | + semodule --list=full | grep container + semodule -B + rpm -Vqf /var/lib/selinux/*/active/modules/200/container /podman_system_test: - tag: [ upstream, downstream ] summary: Run SELinux specific Podman system tests - test: make podman_system_test + test: bash ./podman-tests.sh diff --git a/test/podman-tests.sh b/test/podman-tests.sh index 0033d25..faa504b 100644 --- a/test/podman-tests.sh +++ b/test/podman-tests.sh @@ -10,7 +10,7 @@ if [[ "$(id -u)" -ne 0 ]];then fi # Print versions of distro and installed packages -rpm -q bats container-selinux golang podman podman-tests selinux-policy +rpm -q bats container-selinux podman podman-tests policycoreutils selinux-policy # Run podman system tests bats /usr/share/podman/test/system/410-selinux.bats From c82ff08efb1fe247418b8711e92b850a0364884f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 24 Feb 2025 17:01:52 +0530 Subject: [PATCH 02/12] fix gating.yaml (cherry picked from commit a15b46699ba2930583bd677a292cfc1ce7df64e5) --- gating.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gating.yaml b/gating.yaml index 8f949e2..c692db7 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,7 +1,7 @@ --- !Policy product_versions: - fedora-* -decision_context: +decision_contexts: - bodhi_update_push_stable - bodhi_update_push_testing rules: From e6ab3ec6322e3526c8947967e843148f7a40a929 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 13 Mar 2025 20:26:59 +0000 Subject: [PATCH 03/12] Update to 2.236.0 upstream release Upstream tag: v2.236.0 Upstream commit: 4244f856 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- container-selinux.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index abf490c..1dfba9e 100644 --- a/.gitignore +++ b/.gitignore @@ -233,3 +233,4 @@ /v2.234.1.tar.gz /v2.234.2.tar.gz /v2.235.0.tar.gz +/v2.236.0.tar.gz diff --git a/README.packit b/README.packit index 2cdc258..f5cc99f 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.1.1.post1.dev1+g7c5e02df. +The file was generated using packit 1.2.0.post1.dev13+g55ed4527. diff --git a/container-selinux.spec b/container-selinux.spec index 6fd90dd..cf61d09 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -35,7 +35,7 @@ Epoch: 4 # Keep Version in upstream specfile at 0. It will be automatically set # to the correct value by Packit for copr and koji builds. # IGNORE this comment if you're looking at it in dist-git. -Version: 2.235.0 +Version: 2.236.0 Release: %autorelease License: GPL-2.0-only URL: https://github.com/containers/%{name} diff --git a/sources b/sources index 1602c69..f7b9b50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.235.0.tar.gz) = 5d422ffe69e994d2b30460bef39598ccac52d3607a23dd15e300374f1704c6e5883069aa74cb3b362b9545f4dd4e048b6e9893a6086cbba53e9d5f8185b2ffd2 +SHA512 (v2.236.0.tar.gz) = 02f4cf1549bbe8c647fc2d2af9f239a23b47e67964d2ee66a45578b6494a9257185f210a61a3e666470489698760b6dd336db3e6a867002fdac68f64689d3841 From 4288e98c84e12578ae0c2cd5f413aafbc86e02af Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 28 Apr 2025 19:07:33 +0000 Subject: [PATCH 04/12] Update to 2.237.0 upstream release Upstream tag: v2.237.0 Upstream commit: d7e420a1 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- container-selinux.spec | 5 ++++- sources | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1dfba9e..b1d1698 100644 --- a/.gitignore +++ b/.gitignore @@ -234,3 +234,4 @@ /v2.234.2.tar.gz /v2.235.0.tar.gz /v2.236.0.tar.gz +/v2.237.0.tar.gz diff --git a/README.packit b/README.packit index f5cc99f..807ffc6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.2.0.post1.dev13+g55ed4527. +The file was generated using packit 1.6.0.post1.dev2+gd5a7662a. diff --git a/container-selinux.spec b/container-selinux.spec index cf61d09..afe8b30 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -35,7 +35,7 @@ Epoch: 4 # Keep Version in upstream specfile at 0. It will be automatically set # to the correct value by Packit for copr and koji builds. # IGNORE this comment if you're looking at it in dist-git. -Version: 2.236.0 +Version: 2.237.0 Release: %autorelease License: GPL-2.0-only URL: https://github.com/containers/%{name} @@ -111,6 +111,9 @@ fi %posttrans %selinux_relabel_post +# Empty placeholder check to silence rpmlint +%check + #define license tag if not already defined %{!?_licensedir:%global license %doc} diff --git a/sources b/sources index f7b9b50..907c8b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.236.0.tar.gz) = 02f4cf1549bbe8c647fc2d2af9f239a23b47e67964d2ee66a45578b6494a9257185f210a61a3e666470489698760b6dd336db3e6a867002fdac68f64689d3841 +SHA512 (v2.237.0.tar.gz) = 39226dc5474934eb509bde812a7df3647d38c69d33ff3d54d0774286d1bc325dae867280571d3681e23a334aa785acfb6a1c22ca2f3df6031f95d005145930df From 23e80960f52c5f79d69b1a211f4d0dd6b35dc1aa Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 30 May 2025 18:01:58 +0000 Subject: [PATCH 05/12] Update to 2.238.0 upstream release Upstream tag: v2.238.0 Upstream commit: 36e8f213 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- container-selinux.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b1d1698..8101221 100644 --- a/.gitignore +++ b/.gitignore @@ -235,3 +235,4 @@ /v2.235.0.tar.gz /v2.236.0.tar.gz /v2.237.0.tar.gz +/v2.238.0.tar.gz diff --git a/README.packit b/README.packit index 807ffc6..7e268b5 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.6.0.post1.dev2+gd5a7662a. +The file was generated using packit 1.8.0.post1.dev15+g39511efc. diff --git a/container-selinux.spec b/container-selinux.spec index afe8b30..76589ec 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -35,7 +35,7 @@ Epoch: 4 # Keep Version in upstream specfile at 0. It will be automatically set # to the correct value by Packit for copr and koji builds. # IGNORE this comment if you're looking at it in dist-git. -Version: 2.237.0 +Version: 2.238.0 Release: %autorelease License: GPL-2.0-only URL: https://github.com/containers/%{name} diff --git a/sources b/sources index 907c8b1..866448b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.237.0.tar.gz) = 39226dc5474934eb509bde812a7df3647d38c69d33ff3d54d0774286d1bc325dae867280571d3681e23a334aa785acfb6a1c22ca2f3df6031f95d005145930df +SHA512 (v2.238.0.tar.gz) = f251bab5a5992feb6ce3d295d39a75627bd3c5deddbdb7ad64018c4f3b652637ff27760f40082b1cd31802f500f8927ae96256a4a11aa085b4b84703906f856f From 2663bb5b0c46de4022deae0a3888943f64e84d8a Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 7 Jul 2025 16:08:59 +0000 Subject: [PATCH 06/12] Update to 2.239.0 upstream release Upstream tag: v2.239.0 Upstream commit: 229e8d8b Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- container-selinux.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8101221..f3b7604 100644 --- a/.gitignore +++ b/.gitignore @@ -236,3 +236,4 @@ /v2.236.0.tar.gz /v2.237.0.tar.gz /v2.238.0.tar.gz +/v2.239.0.tar.gz diff --git a/README.packit b/README.packit index 7e268b5..dde2a46 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.8.0.post1.dev15+g39511efc. +The file was generated using packit 1.9.0.post1.dev4+g48b4c222. diff --git a/container-selinux.spec b/container-selinux.spec index 76589ec..c070080 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -35,7 +35,7 @@ Epoch: 4 # Keep Version in upstream specfile at 0. It will be automatically set # to the correct value by Packit for copr and koji builds. # IGNORE this comment if you're looking at it in dist-git. -Version: 2.238.0 +Version: 2.239.0 Release: %autorelease License: GPL-2.0-only URL: https://github.com/containers/%{name} diff --git a/sources b/sources index 866448b..3280111 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.238.0.tar.gz) = f251bab5a5992feb6ce3d295d39a75627bd3c5deddbdb7ad64018c4f3b652637ff27760f40082b1cd31802f500f8927ae96256a4a11aa085b4b84703906f856f +SHA512 (v2.239.0.tar.gz) = a3bafe979394358c9e0d51816fd92765ff88f2fab4a5aa22e1ce533e8ee4d1ce2b59435891ba39acb795f44509104fc558588ded180bfb3b27c4662a0b5a6643 From ec270178dc14b82c2ac86e344fe7d0168ffdc715 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 7 Aug 2025 12:53:58 +0000 Subject: [PATCH 07/12] Update to 2.240.0 upstream release Upstream tag: v2.240.0 Upstream commit: 10cc7eca Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- container-selinux.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f3b7604..67fd154 100644 --- a/.gitignore +++ b/.gitignore @@ -237,3 +237,4 @@ /v2.237.0.tar.gz /v2.238.0.tar.gz /v2.239.0.tar.gz +/v2.240.0.tar.gz diff --git a/README.packit b/README.packit index dde2a46..3ad54d6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.9.0.post1.dev4+g48b4c222. +The file was generated using packit 1.11.0. diff --git a/container-selinux.spec b/container-selinux.spec index c070080..f874f51 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -35,7 +35,7 @@ Epoch: 4 # Keep Version in upstream specfile at 0. It will be automatically set # to the correct value by Packit for copr and koji builds. # IGNORE this comment if you're looking at it in dist-git. -Version: 2.239.0 +Version: 2.240.0 Release: %autorelease License: GPL-2.0-only URL: https://github.com/containers/%{name} diff --git a/sources b/sources index 3280111..64f44ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.239.0.tar.gz) = a3bafe979394358c9e0d51816fd92765ff88f2fab4a5aa22e1ce533e8ee4d1ce2b59435891ba39acb795f44509104fc558588ded180bfb3b27c4662a0b5a6643 +SHA512 (v2.240.0.tar.gz) = d5077aa547c2d85613eb168348fe01d92c198b72f3d3523c90d587f12ff8d221c9ee63da1ed1d7201f592853e1aa77406d10b751a0cd7ba9203ea0a22fea3f9b From dbb6378442e9bbe52ed7388d087d2babc98ed667 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 19 Aug 2025 16:05:17 +0000 Subject: [PATCH 08/12] Update to 2.241.0 upstream release Upstream tag: v2.241.0 Upstream commit: 5997aa52 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- container-selinux.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 67fd154..a27fbf9 100644 --- a/.gitignore +++ b/.gitignore @@ -238,3 +238,4 @@ /v2.238.0.tar.gz /v2.239.0.tar.gz /v2.240.0.tar.gz +/v2.241.0.tar.gz diff --git a/README.packit b/README.packit index 3ad54d6..2be479e 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.11.0. +The file was generated using packit 1.11.0.post1.dev3+g351a3979f. diff --git a/container-selinux.spec b/container-selinux.spec index f874f51..cd7fd8e 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -35,7 +35,7 @@ Epoch: 4 # Keep Version in upstream specfile at 0. It will be automatically set # to the correct value by Packit for copr and koji builds. # IGNORE this comment if you're looking at it in dist-git. -Version: 2.240.0 +Version: 2.241.0 Release: %autorelease License: GPL-2.0-only URL: https://github.com/containers/%{name} diff --git a/sources b/sources index 64f44ff..3211fe3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.240.0.tar.gz) = d5077aa547c2d85613eb168348fe01d92c198b72f3d3523c90d587f12ff8d221c9ee63da1ed1d7201f592853e1aa77406d10b751a0cd7ba9203ea0a22fea3f9b +SHA512 (v2.241.0.tar.gz) = acab4eb986e494c09a7f01d0263c2908bae8b93039fd0584c0cfa32c44b59e72db2d3f09d1c9213e9640b5f7af2361a460658cd49deafca0a37535f5e8b6fd80 From e213c2197cc1b2a268ce1e8927a940fe67aa201d Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 5 Sep 2025 14:44:55 +0000 Subject: [PATCH 09/12] Update to 2.242.0 upstream release Upstream tag: v2.242.0 Upstream commit: edfbda46 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 14 +++++++++++++- README.packit | 2 +- container-selinux.spec | 12 ++++++------ sources | 2 +- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index a27fbf9..9f6dc41 100644 --- a/.gitignore +++ b/.gitignore @@ -239,3 +239,4 @@ /v2.239.0.tar.gz /v2.240.0.tar.gz /v2.241.0.tar.gz +/v2.242.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml index cc1d83b..d25d664 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -54,7 +54,7 @@ jobs: packages: [container-selinux-eln] notifications: *copr_build_failure_notification enable_net: true - targets: + targets: &eln_copr_targets - fedora-eln-x86_64 - fedora-eln-aarch64 @@ -97,6 +97,18 @@ jobs: - type: repository-file id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo + # Tests for Fedora + - job: tests + trigger: pull_request + packages: [container-selinux-eln] + notifications: *test_failure_notification + targets: *eln_copr_targets + tf_extra_params: + environments: + - artifacts: + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-eln/rhcontainerbot-podman-next-fedora-eln.repo + # Tests for CentOS Stream - job: tests trigger: pull_request diff --git a/README.packit b/README.packit index 2be479e..fb341a1 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.11.0.post1.dev3+g351a3979f. +The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32. diff --git a/container-selinux.spec b/container-selinux.spec index cd7fd8e..273ec70 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -20,14 +20,14 @@ %define no_user_namespace 1 %endif -# copr_build is more intuitive than copr_username -%if %{defined copr_username} -%define copr_build 1 +# set copr_build is more intuitive than copr_username +%if %{defined copr_username} && "%{copr_username}" == "rhcontainerbot" && "%{copr_projectname}" == "podman-next" +%define next_build 1 %endif Name: container-selinux -# Set different Epochs for copr and koji -%if %{defined copr_build} +# Set different Epoch for rhcontainerbot/podman-next copr build +%if %{defined next_build} Epoch: 102 %else Epoch: 4 @@ -35,7 +35,7 @@ Epoch: 4 # Keep Version in upstream specfile at 0. It will be automatically set # to the correct value by Packit for copr and koji builds. # IGNORE this comment if you're looking at it in dist-git. -Version: 2.241.0 +Version: 2.242.0 Release: %autorelease License: GPL-2.0-only URL: https://github.com/containers/%{name} diff --git a/sources b/sources index 3211fe3..ab44a19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.241.0.tar.gz) = acab4eb986e494c09a7f01d0263c2908bae8b93039fd0584c0cfa32c44b59e72db2d3f09d1c9213e9640b5f7af2361a460658cd49deafca0a37535f5e8b6fd80 +SHA512 (v2.242.0.tar.gz) = 48ed0644081cd1f52d2e842c46af9c7dd64685aab121a9a275da2ea75eb8b48b7b24ffc45658b6bc78b41a9bad116c3352e1bd540cfba298276519cd6ddea47c From b082cd41d5ea1d9610871a1cac583bbb4c04f529 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 7 Nov 2025 19:02:12 +0000 Subject: [PATCH 10/12] Update to 2.243.0 upstream release Upstream tag: v2.243.0 Upstream commit: efdee4df Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- container-selinux.spec | 2 +- plans/main.fmf | 26 +++++++++++++------ plans/tmt.fmf | 9 +++++++ sources | 2 +- test/main.fmf | 23 +++++++++++++--- ...odman-tests.sh => podman-rootful-tests.sh} | 0 test/podman-rootless-tests.sh | 15 +++++++++++ 9 files changed, 66 insertions(+), 14 deletions(-) create mode 100644 plans/tmt.fmf rename test/{podman-tests.sh => podman-rootful-tests.sh} (100%) create mode 100644 test/podman-rootless-tests.sh diff --git a/.gitignore b/.gitignore index 9f6dc41..9ae95ce 100644 --- a/.gitignore +++ b/.gitignore @@ -240,3 +240,4 @@ /v2.240.0.tar.gz /v2.241.0.tar.gz /v2.242.0.tar.gz +/v2.243.0.tar.gz diff --git a/README.packit b/README.packit index fb341a1..2511bf4 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32. +The file was generated using packit 1.12.0. diff --git a/container-selinux.spec b/container-selinux.spec index 273ec70..fa68c27 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -35,7 +35,7 @@ Epoch: 4 # Keep Version in upstream specfile at 0. It will be automatically set # to the correct value by Packit for copr and koji builds. # IGNORE this comment if you're looking at it in dist-git. -Version: 2.242.0 +Version: 2.243.0 Release: %autorelease License: GPL-2.0-only URL: https://github.com/containers/%{name} diff --git a/plans/main.fmf b/plans/main.fmf index baa8b2f..c758669 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -3,12 +3,12 @@ discover: execute: how: tmt prepare: - - when: distro == centos-stream or distro == rhel - how: shell - script: | - dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm - dnf -y config-manager --set-enabled epel - order: 10 + - how: feature + epel: enabled + # TODO: Revisit this once https://github.com/teemtee/tmt/issues/3990 is in place. + # FIXME: For whatever reason, CentOS Stream envs end up upgrading container-selinux + # from podman-next instead of using the one installed by Packit. This apparently should + # be easier to handle once tmt#3990 is done. Things work as expected on Fedora already. - when: initiator == packit how: shell script: | @@ -16,5 +16,15 @@ prepare: if compgen -G $COPR_REPO_FILE > /dev/null; then sed -i -n '/^priority=/!p;$apriority=1' $COPR_REPO_FILE fi - dnf -y upgrade --allowerasing - order: 20 + +/basic_check: + discover+: + test: /test/basic_check + +/podman_rootful_system: + discover+: + test: /test/podman_rootful_system + +/podman_rootless_system: + discover+: + test: /test/podman_rootless_system diff --git a/plans/tmt.fmf b/plans/tmt.fmf new file mode 100644 index 0000000..1941978 --- /dev/null +++ b/plans/tmt.fmf @@ -0,0 +1,9 @@ +/: + inherit: false + +summary: Run tmt's integration tests +plan: + import: + url: https://github.com/teemtee/tmt + path: /plans/friends + name: /podman diff --git a/sources b/sources index ab44a19..06d448c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.242.0.tar.gz) = 48ed0644081cd1f52d2e842c46af9c7dd64685aab121a9a275da2ea75eb8b48b7b24ffc45658b6bc78b41a9bad116c3352e1bd540cfba298276519cd6ddea47c +SHA512 (v2.243.0.tar.gz) = 8ed193e467d247a277f1d21b6f1f2044273e15301e27ed33e0240af27f8d6ade4585a6fa9953a05bf11298d3a4ef2ea4fdc7f6e43abddd7e03c9c38835ad4429 diff --git a/test/main.fmf b/test/main.fmf index 4b186d5..13b8104 100644 --- a/test/main.fmf +++ b/test/main.fmf @@ -1,9 +1,10 @@ require: - attr - - bats - container-selinux - podman-tests - policycoreutils +recommend: + - bats /basic_check: summary: Run basic checks @@ -12,6 +13,22 @@ require: semodule -B rpm -Vqf /var/lib/selinux/*/active/modules/200/container -/podman_system_test: +/podman_rootful_system: summary: Run SELinux specific Podman system tests - test: bash ./podman-tests.sh + test: bash ./podman-rootful-tests.sh + +/podman_rootless_system: + summary: Run rootless Podman system tests + test: bash ./podman-rootless-tests.sh + require+: + - passt + - passt-selinux + environment: + ROOTLESS_USER: "fedora" + adjust: + - when: distro == centos-stream + environment+: + ROOTLESS_USER: "ec2-user" + - when: distro == fedora-eln or distro == rhel + environment+: + ROOTLESS_USER: "cloud-user" diff --git a/test/podman-tests.sh b/test/podman-rootful-tests.sh similarity index 100% rename from test/podman-tests.sh rename to test/podman-rootful-tests.sh diff --git a/test/podman-rootless-tests.sh b/test/podman-rootless-tests.sh new file mode 100644 index 0000000..e5583e0 --- /dev/null +++ b/test/podman-rootless-tests.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +set -exo pipefail + +cat /etc/redhat-release + +# Print versions of distro and installed packages +rpm -q bats container-selinux passt passt-selinux podman podman-tests policycoreutils selinux-policy + +loginctl enable-linger "$ROOTLESS_USER" + +# Run podman system tests +su - "$ROOTLESS_USER" -c "bats /usr/share/podman/test/system/410-selinux.bats" +su - "$ROOTLESS_USER" -c "bats /usr/share/podman/test/system/500-networking.bats" +su - "$ROOTLESS_USER" -c "bats /usr/share/podman/test/system/505-networking-pasta.bats" From 6c3c870081c3eff23421a90dae5238e14361d8d8 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 1 Dec 2025 15:51:32 +0000 Subject: [PATCH 11/12] Update to 2.244.0 upstream release Upstream tag: v2.244.0 Upstream commit: 9017e1f8 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- container-selinux.spec | 2 +- sources | 2 +- test/main.fmf | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9ae95ce..0891100 100644 --- a/.gitignore +++ b/.gitignore @@ -241,3 +241,4 @@ /v2.241.0.tar.gz /v2.242.0.tar.gz /v2.243.0.tar.gz +/v2.244.0.tar.gz diff --git a/README.packit b/README.packit index 2511bf4..b4b46e3 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.12.0. +The file was generated using packit 1.12.0.post1.dev20+g7d30dac21. diff --git a/container-selinux.spec b/container-selinux.spec index fa68c27..07c8f41 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -35,7 +35,7 @@ Epoch: 4 # Keep Version in upstream specfile at 0. It will be automatically set # to the correct value by Packit for copr and koji builds. # IGNORE this comment if you're looking at it in dist-git. -Version: 2.243.0 +Version: 2.244.0 Release: %autorelease License: GPL-2.0-only URL: https://github.com/containers/%{name} diff --git a/sources b/sources index 06d448c..68be440 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.243.0.tar.gz) = 8ed193e467d247a277f1d21b6f1f2044273e15301e27ed33e0240af27f8d6ade4585a6fa9953a05bf11298d3a4ef2ea4fdc7f6e43abddd7e03c9c38835ad4429 +SHA512 (v2.244.0.tar.gz) = 21bb73a226d96a152de53475ad23d1daa119a20d83c835c7c5c2da011a2fd066955db1b4d4e11527883f7ef5dc027937bd9f1f65bc4388b44aed10337936f877 diff --git a/test/main.fmf b/test/main.fmf index 13b8104..741aef1 100644 --- a/test/main.fmf +++ b/test/main.fmf @@ -29,6 +29,6 @@ recommend: - when: distro == centos-stream environment+: ROOTLESS_USER: "ec2-user" - - when: distro == fedora-eln or distro == rhel + - when: distro == rhel environment+: ROOTLESS_USER: "cloud-user" From c54efb867f63be884303aff33a0a3e03798683f4 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 15 Dec 2025 15:49:29 +0000 Subject: [PATCH 12/12] Update to 2.245.0 upstream release Upstream tag: v2.245.0 Upstream commit: 3f7c37e9 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- container-selinux.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0891100..523a91e 100644 --- a/.gitignore +++ b/.gitignore @@ -242,3 +242,4 @@ /v2.242.0.tar.gz /v2.243.0.tar.gz /v2.244.0.tar.gz +/v2.245.0.tar.gz diff --git a/README.packit b/README.packit index b4b46e3..db537f9 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.12.0.post1.dev20+g7d30dac21. +The file was generated using packit 1.13.0. diff --git a/container-selinux.spec b/container-selinux.spec index 07c8f41..6348202 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -35,7 +35,7 @@ Epoch: 4 # Keep Version in upstream specfile at 0. It will be automatically set # to the correct value by Packit for copr and koji builds. # IGNORE this comment if you're looking at it in dist-git. -Version: 2.244.0 +Version: 2.245.0 Release: %autorelease License: GPL-2.0-only URL: https://github.com/containers/%{name} diff --git a/sources b/sources index 68be440..ce107a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.244.0.tar.gz) = 21bb73a226d96a152de53475ad23d1daa119a20d83c835c7c5c2da011a2fd066955db1b4d4e11527883f7ef5dc027937bd9f1f65bc4388b44aed10337936f877 +SHA512 (v2.245.0.tar.gz) = 0bc85980780631ceccb38f2fde64ff7f3792be18d4501806532f097deedde70f446e2389c543dd78e9087b45cd1a6916c0e096e6ea42dd77ac377ad4111b7db2