summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-04-26 08:08:53 -0400
committerGitHub <noreply@github.com>2022-04-26 08:08:53 -0400
commit9db22fb58abda8ccaf9fe68490d8c8f9a8dc994f (patch)
treeb4947830a002df07b58e98eefc427b34ff5fc7ea
parent913a3a813c168b47f982bb6851a0968858946f85 (diff)
parentc5e48f12ecff8b1e66e60ef4ade4d7341720269f (diff)
downloadpodman-9db22fb58abda8ccaf9fe68490d8c8f9a8dc994f.tar.gz
podman-9db22fb58abda8ccaf9fe68490d8c8f9a8dc994f.tar.bz2
podman-9db22fb58abda8ccaf9fe68490d8c8f9a8dc994f.zip
Merge pull request #14004 from cevich/refix_docker-py
[CI:BUILD] Cirrus: Re-fix build-cache miss on main
-rwxr-xr-xcontrib/cirrus/runner.sh1
-rwxr-xr-xcontrib/cirrus/setup_environment.sh2
2 files changed, 1 insertions, 2 deletions
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
}
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