diff options
| author | Lokesh Mandvekar <lsm5@fedoraproject.org> | 2022-01-31 11:44:52 -0500 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2022-02-11 14:49:44 -0500 |
| commit | 926c3b08ae4cf0d825f48b9a54a1544123be6fb7 (patch) | |
| tree | c67b1dbd114aac0c79489a5ed304d4e5a717cd7e /contrib/cirrus | |
| parent | 1e3115cf42b3abc2cd62427e59ba71851da29b12 (diff) | |
| download | podman-926c3b08ae4cf0d825f48b9a54a1544123be6fb7.tar.gz podman-926c3b08ae4cf0d825f48b9a54a1544123be6fb7.tar.bz2 podman-926c3b08ae4cf0d825f48b9a54a1544123be6fb7.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-x | contrib/cirrus/setup_environment.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 4e9361152..2ae5c2d77 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -289,11 +289,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" @@ -310,7 +310,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` |