Update to 2.245.0 upstream release

Upstream tag: v2.245.0
Upstream commit: 3f7c37e9

Commit authored by Packit automation (https://packit.dev/)

.gitignore

@@ -227,9 +227,19 @@
 /v2.229.1.tar.gz
 /v2.230.0.tar.gz
 /v2.231.0.tar.gz
+/packit-tmt-bodhi-reuse.zip
 /v2.232.1.tar.gz
 /v2.233.0.tar.gz
 /v2.234.1.tar.gz
 /v2.234.2.tar.gz
 /v2.235.0.tar.gz
 /v2.236.0.tar.gz
+/v2.237.0.tar.gz
+/v2.238.0.tar.gz
+/v2.239.0.tar.gz
+/v2.240.0.tar.gz
+/v2.241.0.tar.gz
+/v2.242.0.tar.gz
+/v2.243.0.tar.gz
+/v2.244.0.tar.gz
+/v2.245.0.tar.gz

.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

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.13.0.

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.236.0
+Version: 2.245.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}
 

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

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

sources

@@ -1 +1 @@
-SHA512 (v2.236.0.tar.gz) = 02f4cf1549bbe8c647fc2d2af9f239a23b47e67964d2ee66a45578b6494a9257185f210a61a3e666470489698760b6dd336db3e6a867002fdac68f64689d3841
+SHA512 (v2.245.0.tar.gz) = 0bc85980780631ceccb38f2fde64ff7f3792be18d4501806532f097deedde70f446e2389c543dd78e9087b45cd1a6916c0e096e6ea42dd77ac377ad4111b7db2

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 == rhel
+          environment+:
+            ROOTLESS_USER: "cloud-user"

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"

tests/tests.yml

@@ -1,16 +0,0 @@
-- hosts: localhost
-  tags:
-  - classic
-  roles:
-  - role: standard-test-basic
-    required_packages:
-    - policycoreutils
-    - container-selinux
-    - podman
-    tests:
-    - is-module-installed:
-        run: semodule --list=full | grep container
-    - can-rebuild-policy:
-        run: semodule -B
-    - can-run-podman:
-        run: podman run --rm quay.io/libpod/testimage:20210610 cat -v /proc/self/attr/current