From a7d932422d4c106c97ece7d39e3107daa5857450 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Tue, 2 Aug 2022 14:19:48 -0400
Subject: Cirrus: use dnf instead of rpm to install packages

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 contrib/cirrus/setup_environment.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'contrib')

diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index d5044816d..88109c808 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -284,7 +284,7 @@ case "$TEST_FLAVOR" in
         ;&  # continue with next item
     compose)
         make install.tools
-        rpm -ivh $PACKAGE_DOWNLOAD_DIR/podman-docker*
+        dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-docker*
         ;&  # continue with next item
     int) ;&
     sys) ;&
@@ -314,7 +314,7 @@ case "$TEST_FLAVOR" in
         install_test_configs
         ;;
     machine)
-        rpm -ivh $PACKAGE_DOWNLOAD_DIR/podman-gvproxy*
+        dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-gvproxy*
         remove_packaged_podman_files
         make install.tools
         make install PREFIX=/usr ETCDIR=/etc
-- 
cgit v1.2.3-54-g00ecf


From 297c7223831151e20288d2699a94d9b0d6da0d13 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Fri, 5 Aug 2022 16:03:03 -0400
Subject: [CI:COPR] podman.spec.rpkg: add python3 dependency for el8

EL8 builds are failing because hack/markdown-preprocess needs python3
which AFAICT isn't included by default in EL8 build environments.

This commit also includes an additional `[CI:COPR]` mode which is
currently runs the same tests as `[CI:DOCS]` but could differ in future.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .cirrus.yml               |  4 ++++
 contrib/cirrus/CIModes.md | 10 ++++++++++
 podman.spec.rpkg          |  1 +
 3 files changed, 15 insertions(+)

(limited to 'contrib')

diff --git a/.cirrus.yml b/.cirrus.yml
index 0288c64e9..2a6fd2181 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -240,6 +240,7 @@ bindings_task:
     only_if: >-
         $CIRRUS_PR != '' &&
         $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' &&
+        $CIRRUS_CHANGE_TITLE !=~ '.*CI:COPR.*' &&
         $CIRRUS_CHANGE_TITLE !=~ '.*CI:BUILD.*'
     depends_on:
         - build
@@ -393,6 +394,7 @@ docker-py_test_task:
     only_if: &not_tag_branch_build_docs >-
         $CIRRUS_PR != '' &&
         $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' &&
+        $CIRRUS_CHANGE_TITLE !=~ '.*CI:COPR.*' &&
         $CIRRUS_CHANGE_TITLE !=~ '.*CI:BUILD.*'
 
     depends_on:
@@ -627,6 +629,7 @@ local_system_test_task: &local_system_test_task
     only_if: &not_tag_build_docs_multiarch >-
         $CIRRUS_TAG == '' &&
         $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' &&
+        $CIRRUS_CHANGE_TITLE !=~ '.*CI:COPR.*' &&
         $CIRRUS_CHANGE_TITLE !=~ '.*CI:BUILD.*' &&
         $CIRRUS_CRON != 'multiarch'
     depends_on:
@@ -906,6 +909,7 @@ artifacts_task:
     # Docs: ./contrib/cirrus/CIModes.md
     only_if: >-
         $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' &&
+        $CIRRUS_CHANGE_TITLE !=~ '.*CI:COPR.*' &&
         $CIRRUS_CRON != 'multiarch'
     depends_on:
         - success
diff --git a/contrib/cirrus/CIModes.md b/contrib/cirrus/CIModes.md
index c782ca64b..0b5a189a6 100644
--- a/contrib/cirrus/CIModes.md
+++ b/contrib/cirrus/CIModes.md
@@ -85,6 +85,16 @@ of this document, it's not possible to override the behavior of `$CIRRUS_PR`.
 + meta
 + success
 
+### Intended `[CI:COPR]` PR Tasks:
++ ext_svc_check
++ automation
++ *build*
++ validate
++ swagger
++ consistency
++ meta
++ success
+
 ### Intend `[CI:BUILD]` PR Tasks:
 + ext_svc_check
 + automation
diff --git a/podman.spec.rpkg b/podman.spec.rpkg
index 7068c9745..f27b31108 100644
--- a/podman.spec.rpkg
+++ b/podman.spec.rpkg
@@ -59,6 +59,7 @@ BuildRequires: go-rpm-macros
 %endif
 %if 0%{?rhel} <= 8
 BuildRequires: pkgconfig(devmapper)
+BuildRequires: python3
 %endif
 BuildRequires: gpgme-devel
 BuildRequires: libassuan-devel
-- 
cgit v1.2.3-54-g00ecf