diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-08-03 15:14:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-03 15:14:22 +0000 |
| commit | c1a38eb773af07b1f84a2b3f1780b216c4278e15 (patch) | |
| tree | ac424714eb459751a26bf693576c9279c6bf73d5 | |
| parent | e54dac4dc66701d310621a6cfbe41ecc4a6b8711 (diff) | |
| parent | 50981cb8468001e9a3c5af2b0a0670ce35b7e7db (diff) | |
| download | podman-c1a38eb773af07b1f84a2b3f1780b216c4278e15.tar.gz podman-c1a38eb773af07b1f84a2b3f1780b216c4278e15.tar.bz2 podman-c1a38eb773af07b1f84a2b3f1780b216c4278e15.zip | |
Merge pull request #15161 from lsm5/switch-to-dnf
Cirrus: use dnf instead of rpm to install packages
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 4 | ||||
| -rw-r--r-- | test/system/200-pod.bats | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index c3b7811bc..f84f78ee9 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -277,7 +277,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) ;& @@ -307,7 +307,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 diff --git a/test/system/200-pod.bats b/test/system/200-pod.bats index cbbd62ffb..b1b9ee5e1 100644 --- a/test/system/200-pod.bats +++ b/test/system/200-pod.bats @@ -482,6 +482,7 @@ spec: skip_if_remote "resource limits only implemented on non-remote" skip_if_rootless "resource limits only work with root" skip_if_cgroupsv1 "resource limits only meaningful on cgroups V2" + skip_if_aarch64 "FIXME: #15074 - flakes often on aarch64" # create loopback device lofile=${PODMAN_TMPDIR}/disk.img |