summaryrefslogtreecommitdiff
path: root/contrib/cirrus
diff options
context:
space:
mode:
authorLokesh Mandvekar <lsm5@fedoraproject.org>2022-01-31 11:44:52 -0500
committerLokesh Mandvekar <lsm5@fedoraproject.org>2022-01-31 11:47:39 -0500
commite7bdd1260b975738e0a6d491c227f1a3cd5fb9fb (patch)
tree2531e61df56b930810beba64681fc66604752152 /contrib/cirrus
parentcb0f31624ce5a04af5958e386b5256c86784ad54 (diff)
downloadpodman-e7bdd1260b975738e0a6d491c227f1a3cd5fb9fb.tar.gz
podman-e7bdd1260b975738e0a6d491c227f1a3cd5fb9fb.tar.bz2
podman-e7bdd1260b975738e0a6d491c227f1a3cd5fb9fb.zip
CI: fix nightly builds
Nightly builds were failing on CI ever since the Makefile change to have install target independent of build targets. See: e4636ebdc84ca28cf378873435cc9a27c81756f8 This commit ensures everything is built before installation. [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
Diffstat (limited to 'contrib/cirrus')
-rwxr-xr-xcontrib/cirrus/setup_environment.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 44c821bc1..6a3597402 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -252,11 +252,11 @@ case "$TEST_FLAVOR" in
die "Refusing to config. host-test in container";
fi
remove_packaged_podman_files
- make install PREFIX=/usr ETCDIR=/etc
+ make && make install PREFIX=/usr ETCDIR=/etc
elif [[ "$TEST_ENVIRON" == "container" ]]; then
if ((CONTAINER)); then
remove_packaged_podman_files
- make install PREFIX=/usr ETCDIR=/etc
+ make && make install PREFIX=/usr ETCDIR=/etc
fi
else
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
remove_packaged_podman_files
- make install PREFIX=/usr ETCDIR=/etc
+ make && make install PREFIX=/usr ETCDIR=/etc
msg "Installing docker and containerd"
# N/B: Tests check/expect `docker info` output, and this `!= podman info`