From f5e56373a3e582ff84fac2bc4e4874a23230f7be Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 19 Aug 2025 16:05:32 +0000 Subject: [PATCH 1/5] 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 ac7e099b8e4e99fd11302236418597f6041888ff Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 5 Sep 2025 14:44:40 +0000 Subject: [PATCH 2/5] 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 99f38c064f082eeda912d7da59b822f80d4bbbc6 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 7 Nov 2025 19:05:10 +0000 Subject: [PATCH 3/5] 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 3f88bda292ee2de6b5bc847b37f68206c4c009ec Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 1 Dec 2025 15:51:17 +0000 Subject: [PATCH 4/5] 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 615e4619a44c9275352a61d5fc766b77d439b869 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 15 Dec 2025 15:49:15 +0000 Subject: [PATCH 5/5] 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