From 9174472637a760fca77fd8f92d40cbf0bca21dec Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 21 Jun 2021 08:38:58 -0700
Subject: [PATCH] Run podman tests on updates

It has been noted that updates have broken podman in the past and
this is a major issue for some users. Let's create a new update
flavor and run the test in it. We'll use the server image as a
base, but it's not really a server test, so I'm giving it its own
flavor so it's not run on updates that we only want to run server
tests on, and we can schedule just this test to run on container-y
updates.

As part of this, we need to install podman before running the
test; for flavors we currently run it on we expect podman to be
preinstalled, but that's not true for the server base image.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 templates-updates.fif.json | 47 ++++++++++++++++++++++++++++++++++++++
 tests/podman.pm            |  2 ++
 2 files changed, 49 insertions(+)

diff --git a/templates-updates.fif.json b/templates-updates.fif.json
index 7a53075a..0fe7efa3 100644
--- a/templates-updates.fif.json
+++ b/templates-updates.fif.json
@@ -1,5 +1,26 @@
 {
     "Products": {
+        "fedora-updates-container-aarch64-*": {
+            "arch": "aarch64",
+            "distri": "fedora",
+            "flavor": "updates-container",
+            "settings": {},
+            "version": "*"
+        },
+        "fedora-updates-container-ppc64le-*": {
+            "arch": "ppc64le",
+            "distri": "fedora",
+            "flavor": "updates-container",
+            "settings": {},
+            "version": "*"
+        },
+        "fedora-updates-container-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "updates-container",
+            "settings": {},
+            "version": "*"
+        },
         "fedora-updates-everything-boot-iso-x86_64-*": {
             "arch": "x86_64",
             "distri": "fedora",
@@ -100,6 +121,18 @@
         }
     },
     "Profiles": {
+        "fedora-updates-container-aarch64-*-aarch64": {
+            "machine": "aarch64",
+            "product": "fedora-updates-container-aarch64-*"
+        },
+        "fedora-updates-container-ppc64le-*-ppc64le": {
+            "machine": "ppc64le",
+            "product": "fedora-updates-container-ppc64le-*"
+        },
+        "fedora-updates-container-x86_64-*-64bit": {
+            "machine": "64bit",
+            "product": "fedora-updates-container-x86_64-*"
+        },
         "fedora-updates-everything-boot-iso-x86_64-*-64bit": {
             "machine": "64bit",
             "product": "fedora-updates-everything-boot-iso-x86_64-*"
@@ -316,6 +349,20 @@
                 "USER_LOGIN": "false"
             }
         },
+        "podman": {
+            "profiles": {
+                "fedora-updates-container-aarch64-*-aarch64": 40,
+                "fedora-updates-container-ppc64le-*-ppc64le": 40,
+                "fedora-updates-container-x86_64-*-64bit": 40
+            }
+        },
+        "podman_client": {
+            "profiles": {
+                "fedora-updates-container-aarch64-*-aarch64": 40,
+                "fedora-updates-container-ppc64le-*-ppc64le": 40,
+                "fedora-updates-container-x86_64-*-64bit": 40
+            }
+        },
         "realmd_join_cockpit": {
             "profiles": {
                 "fedora-updates-server-aarch64-*-aarch64": 40,
diff --git a/tests/podman.pm b/tests/podman.pm
index f612e435..1ada05f0 100644
--- a/tests/podman.pm
+++ b/tests/podman.pm
@@ -9,6 +9,8 @@ use utils;
 sub run {
     my $self = shift;
     $self->root_console(tty=>3);
+    # on non-canned flavors, we need to install podman
+    assert_script_run "dnf -y install podman", 180 unless (get_var("CANNED"));
     # check podman is installed
     assert_script_run "rpm -q podman";
     # check to see if you can pull an image from the registry