From ee8d49cc5e92f4d17f2fb8d24b75fb6dc3b48068 Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: May 21 2020 16:14:15 +0000
Subject: Gating tests: many fixes


 1) Ugh. Update the podman test scaffolding so it invokes
    the magic 'loginctl enable-linger' command necessary
    for rootless podman to work.

    1a) [minor] update the rpm-versions and environment dump

 2) Bring gating.yaml up-to-date, including (ugh) duplication
    that will help us avoid maintenance burden when we fork f33

Signed-off-by: Ed Santiago <santiago@redhat.com>

---

diff --git a/gating.yaml b/gating.yaml
index c2182c7..c8a218f 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -2,5 +2,13 @@
 product_versions:
   - fedora-*
 decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
 rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
diff --git a/tests/test_podman.sh b/tests/test_podman.sh
index efeabdd..75bcc53 100755
--- a/tests/test_podman.sh
+++ b/tests/test_podman.sh
@@ -5,7 +5,13 @@
 
 # Log program and kernel versions
 echo "Important package versions:"
-rpm -qa | egrep 'conmon|podman|iptable|slirp|systemd' | sort | sed -e 's/^/  /'
-uname -a
+(
+    uname -r
+    rpm -qa | egrep 'podman|conmon|crun|runc|iptable|slirp|systemd|container-selinux' | sort
+) | sed -e 's/^/  /'
+
+# Log environment; or at least the useful bits
+echo "Environment:"
+env | grep -v LS_COLORS= | sort | sed -e 's/^/  /'
 
 bats /usr/share/podman/test/system
diff --git a/tests/test_podman.yml b/tests/test_podman.yml
index 8d7b4cf..afd80c6 100644
--- a/tests/test_podman.yml
+++ b/tests/test_podman.yml
@@ -19,5 +19,5 @@
             # running the test with su doesn't create the directory for fedora user on /run/user/
             # so create it manually
             dir: ./
-            run: mkdir /run/user/$(id -u fedora); chown fedora /run/user/$(id -u fedora); su -c ${PWD}/test_podman.sh - fedora
+            run: loginctl enable-linger fedora; su -c ${PWD}/test_podman.sh - fedora
             timeout: 15m