From 1a7858c1961ffa3865e6ad4af3001242c35156a2 Mon Sep 17 00:00:00 2001
From: Jakub Rusz <jrusz@redhat.com>
Date: Tue, 5 Oct 2021 17:40:28 +0200
Subject: [PATCH] tests: enable koji.sh test on RHEL-9

---
 .gitlab-ci.yml     | 10 +---------
 test/cases/koji.sh |  3 +++
 tools/provision.sh |  3 +--
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5725599b9..63d41568b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -261,21 +261,13 @@ Integration:
         RUNNER:
           - aws/rhel-8.4-ga-x86_64
           - aws/rhel-8.5-nightly-x86_64
+          - aws/rhel-9.0-beta-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
       - SCRIPT:
           - azure_hyperv_gen2.sh
         RUNNER:
           - aws/rhel-8.5-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
-      - SCRIPT:
-          - aws.sh
-          - azure.sh
-          - filesystem.sh
-          - vmware.sh
-          - cross-distro.sh
-        RUNNER:
-          - aws/rhel-9.0-beta-nightly-x86_64
-        INTERNAL_NETWORK: ["true"]
 
 .API_TESTS: &API_TESTS
   TARGET:
diff --git a/test/cases/koji.sh b/test/cases/koji.sh
index 1e143af49..4da40e089 100755
--- a/test/cases/koji.sh
+++ b/test/cases/koji.sh
@@ -14,6 +14,9 @@ function greenprint {
 # Provision the software under test.
 /usr/libexec/osbuild-composer-test/provision.sh
 
+# Make sure podman-plugins are installed
+sudo dnf -y install podman-plugins
+
 greenprint "Starting containers"
 sudo /usr/libexec/osbuild-composer-test/run-koji-container.sh start
 
diff --git a/tools/provision.sh b/tools/provision.sh
index 564e5aa65..a5e2f7910 100755
--- a/tools/provision.sh
+++ b/tools/provision.sh
@@ -18,9 +18,8 @@ elif [[ $ID == rhel || $ID == centos ]] && [[ ${VERSION_ID%.*} == 9 ]]; then
     curl -LO --insecure https://hdn.corp.redhat.com/rhel8-csb/RPMS/noarch/redhat-internal-cert-install-0.1-23.el7.csb.noarch.rpm
     sudo dnf install -y ./redhat-internal-cert-install-0.1-23.el7.csb.noarch.rpm dnf-plugins-core
     sudo dnf copr enable -y copr.devel.redhat.com/osbuild-team/epel-el9 "rhel-9.dev-$ARCH"
-    # koji is not available yet apparently
     # jmespath required for json_query
-    sudo dnf install -y ansible-core python3-jmespath
+    sudo dnf install -y ansible-core koji python3-jmespath
 
     # json_query filter, used in our ansible playbooks, was moved to the
     # 'community.general' collection