diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-11 00:35:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-11 00:35:35 +0000 |
| commit | edb3f70bccd2eae14ddd95c74db35731b508f407 (patch) | |
| tree | 51e82489a9398d2378011cda7889137c912cdaad /contrib | |
| parent | b53eccfc2adea661e4e4b48b59d4e3f8d3d4883a (diff) | |
| parent | eba1f77497efb48d810d3c2d2fa6cccecea695cb (diff) | |
| download | podman-edb3f70bccd2eae14ddd95c74db35731b508f407.tar.gz podman-edb3f70bccd2eae14ddd95c74db35731b508f407.tar.bz2 podman-edb3f70bccd2eae14ddd95c74db35731b508f407.zip | |
Merge pull request #15279 from mheon/bump_420_final
Final Backports and Bump to v4.2.0
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cirrus/CIModes.md | 10 | ||||
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 4 |
2 files changed, 12 insertions, 2 deletions
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/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 |