diff options
| author | Ed Santiago <santiago@redhat.com> | 2022-09-21 14:33:18 -0600 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2022-09-27 05:52:34 -0600 |
| commit | 0fb95f95d2af7bcc2529f896fec9904b3357b580 (patch) | |
| tree | da40582be1a46cee1cc6fa6decc427a8185e24f0 /contrib/cirrus/setup_environment.sh | |
| parent | f51aeb45d497379b6e0a11414d69435e83908efa (diff) | |
| download | podman-0fb95f95d2af7bcc2529f896fec9904b3357b580.tar.gz podman-0fb95f95d2af7bcc2529f896fec9904b3357b580.tar.bz2 podman-0fb95f95d2af7bcc2529f896fec9904b3357b580.zip | |
CI: only make install.tools when needed
Reintroduce .install.foo targets into Makefile, and invoke
only the bare-minimum ones needed for each individual CI
step in setup_environment.sh.
Also add a retry to the golangci-lint curl, in hopes of
dealing with network flakes. And remove the -f (fail)
because it produces unhelpful logs.
Reason: saw about 25% CI flakes yesterday due to the golangci-lint
fetch, something about a timeout, and this was especially frustrating
because none of the steps actually needed lint. Quick reminder:
avoid network fetches unless absolutely necessary.
Fixes: #15892
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index f84f78ee9..4c86bbcfa 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -232,8 +232,7 @@ case "$TEST_FLAVOR" in validate) dnf install -y $PACKAGE_DOWNLOAD_DIR/python3*.rpm # For some reason, this is also needed for validation - make install.tools - make .install.pre-commit + make .install.pre-commit .install.gitvalidation ;; automation) ;; altbuild) @@ -242,11 +241,9 @@ case "$TEST_FLAVOR" in if [[ "$ALT_NAME" =~ RPM ]]; then bigto dnf install -y glibc-minimal-langpack go-rpm-macros rpkg rpm-build shadow-utils-subid-devel fi - make install.tools ;; docker-py) remove_packaged_podman_files - make install.tools make install PREFIX=/usr ETCDIR=/etc msg "Installing previously downloaded/cached packages" @@ -258,16 +255,14 @@ case "$TEST_FLAVOR" in ;; build) make clean ;; unit) - make install.tools + make .install.ginkgo ;; compose_v2) - make install.tools dnf -y remove docker-compose curl -SL https://github.com/docker/compose/releases/download/v2.2.3/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose chmod +x /usr/local/bin/docker-compose ;& # Continue with next item apiv2) - make install.tools msg "Installing previously downloaded/cached packages" dnf install -y $PACKAGE_DOWNLOAD_DIR/python3*.rpm virtualenv .venv/requests @@ -276,16 +271,16 @@ case "$TEST_FLAVOR" in pip install --requirement $GOSRC/test/apiv2/python/requirements.txt ;& # continue with next item compose) - make install.tools dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-docker* ;& # continue with next item - int) ;& + int) + make .install.ginkgo + ;& sys) ;& upgrade_test) ;& bud) ;& bindings) ;& endpoint) - make install.tools # Use existing host bits when testing is to happen inside a container # since this script will run again in that environment. # shellcheck disable=SC2154 @@ -309,7 +304,6 @@ case "$TEST_FLAVOR" in machine) dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-gvproxy* remove_packaged_podman_files - make install.tools make install PREFIX=/usr ETCDIR=/etc install_test_configs ;; @@ -374,7 +368,7 @@ case "$TEST_FLAVOR" in swagger) ;& # use next item consistency) make clean - make install.tools + make .install.goimports ;; release) ;; *) die_unknown TEST_FLAVOR |