From eb4e53087e60e8655d8ba0855e5526dc350cb963 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Mon, 25 Apr 2022 15:31:36 -0400 Subject: Revert "Cirrus: Fix cirrus cache race on bin/podman" This reverts commit 2f53259a8d5cd8022e797ea22a354a63bef1803a. Signed-off-by: Chris Evich --- contrib/cirrus/runner.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 1953c477e..aee9bcfbb 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -121,7 +121,6 @@ function _run_bindings() { function _run_docker-py() { source .venv/docker-py/bin/activate - make binaries make run-docker-py-tests } -- cgit v1.2.3-54-g00ecf From c5e48f12ecff8b1e66e60ef4ade4d7341720269f Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Mon, 25 Apr 2022 15:33:11 -0400 Subject: Cirrus: Re-fix build-cache miss on main After merging #13998 it was observed that the `docker-py` task was still failing with the same error on `main`. The original quick-fix had placed the full-build (`make`) call too late in the process. This commit moves it up to right before the `make install` call which was resulting in an error. Again, a further future commit is planned to re-work and simplify the entire cache setup. This is only a quick fix to make branch-builds pass. Signed-off-by: Chris Evich --- contrib/cirrus/setup_environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index a7d0f7fa1..742289733 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -268,7 +268,7 @@ case "$TEST_FLAVOR" in ;; docker-py) remove_packaged_podman_files - make install PREFIX=/usr ETCDIR=/etc + make && make install PREFIX=/usr ETCDIR=/etc msg "Installing previously downloaded/cached packages" dnf install -y $PACKAGE_DOWNLOAD_DIR/python3*.rpm -- cgit v1.2.3-54-g00ecf