opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 03:08:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15161 from lsm5/switch-to-dnf

Browse Source 
Cirrus: use dnf instead of rpm to install packages
This commit is contained in:
openshift-ci[bot]
2022-08-03 15:14:22 +00:00
committed by GitHub
parent e54dac4dc6 50981cb846
commit c1a38eb773
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/cirrus/setup_environment.sh
View File

@ -277,7 +277,7 @@ case "$TEST_FLAVOR" in
;& # continue with next item ;& # continue with next item
compose) compose)
make install.tools make install.tools
rpm -ivh $PACKAGE_DOWNLOAD_DIR/podman-docker* dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-docker*
;& # continue with next item ;& # continue with next item
int) ;& int) ;&
sys) ;& sys) ;&
@ -307,7 +307,7 @@ case "$TEST_FLAVOR" in
install_test_configs install_test_configs
;; ;;
machine) machine)
rpm -ivh $PACKAGE_DOWNLOAD_DIR/podman-gvproxy* dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-gvproxy*
remove_packaged_podman_files remove_packaged_podman_files
make install.tools make install.tools
make install PREFIX=/usr ETCDIR=/etc make install PREFIX=/usr ETCDIR=/etc

1
test/system/200-pod.bats
View File

@ -482,6 +482,7 @@ spec:
skip_if_remote "resource limits only implemented on non-remote" skip_if_remote "resource limits only implemented on non-remote"
skip_if_rootless "resource limits only work with root" skip_if_rootless "resource limits only work with root"
skip_if_cgroupsv1 "resource limits only meaningful on cgroups V2" skip_if_cgroupsv1 "resource limits only meaningful on cgroups V2"
skip_if_aarch64 "FIXME: #15074 - flakes often on aarch64"
# create loopback device # create loopback device
lofile=${PODMAN_TMPDIR}/disk.img lofile=${PODMAN_TMPDIR}/disk.img