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

Merge pull request #13091 from lsm5/fix-nightly-ci-builds

Browse Source 
CI: fix nightly builds
This commit is contained in:
OpenShift Merge Robot
2022-01-31 15:26:32 -05:00
committed by GitHub
parent cb0f31624c e7bdd1260b
commit 271867263c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/cirrus/setup_environment.sh
View File

@ -252,11 +252,11 @@ case "$TEST_FLAVOR" in
die "Refusing to config. host-test in container"; die "Refusing to config. host-test in container";
fi fi
remove_packaged_podman_files remove_packaged_podman_files
make install PREFIX=/usr ETCDIR=/etc make && make install PREFIX=/usr ETCDIR=/etc
elif [[ "$TEST_ENVIRON" == "container" ]]; then elif [[ "$TEST_ENVIRON" == "container" ]]; then
if ((CONTAINER)); then if ((CONTAINER)); then
remove_packaged_podman_files remove_packaged_podman_files
make install PREFIX=/usr ETCDIR=/etc make && make install PREFIX=/usr ETCDIR=/etc
fi fi
else else
die "Invalid value for $$TEST_ENVIRON=$TEST_ENVIRON" die "Invalid value for $$TEST_ENVIRON=$TEST_ENVIRON"
@ -273,7 +273,7 @@ case "$TEST_FLAVOR" in
# Ref: https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27270#note_499585550 # Ref: https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27270#note_499585550
remove_packaged_podman_files remove_packaged_podman_files
make install PREFIX=/usr ETCDIR=/etc make && make install PREFIX=/usr ETCDIR=/etc
msg "Installing docker and containerd" msg "Installing docker and containerd"
# N/B: Tests check/expect `docker info` output, and this `!= podman info` # N/B: Tests check/expect `docker info` output, and this `!= podman info`