summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoropenshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com>2022-08-06 11:27:29 +0000
committerGitHub <noreply@github.com>2022-08-06 11:27:29 +0000
commitb3a5a22209e69dc689b28de79d8b84bab30dc0d5 (patch)
tree7d8532a44b12c0b1aae080e7a670a8d642fbc82b
parent66c246d2c13edb893368fef4ba3a9770c00f8f3b (diff)
parent7ebaabb9301a3238bba82250b3d6414c6dcc9e0c (diff)
downloadpodman-b3a5a22209e69dc689b28de79d8b84bab30dc0d5.tar.gz
podman-b3a5a22209e69dc689b28de79d8b84bab30dc0d5.tar.bz2
podman-b3a5a22209e69dc689b28de79d8b84bab30dc0d5.zip
Merge pull request #15220 from lsm5/fix-copr-el8-deps
[CI:COPR] podman.spec.rpkg: add python3 dependency for el8
-rw-r--r--.cirrus.yml4
-rw-r--r--contrib/cirrus/CIModes.md10
-rw-r--r--podman.spec.rpkg1
3 files changed, 15 insertions, 0 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 32771cb88..bf8dc5e25 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -308,6 +308,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
@@ -483,6 +484,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:
@@ -720,6 +722,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:
@@ -1036,6 +1039,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