summaryrefslogtreecommitdiff
path: root/contrib/cirrus
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-03-18 12:48:41 +0100
committerGitHub <noreply@github.com>2022-03-18 12:48:41 +0100
commit3853ef9b598b82115c1609957169614b26320a26 (patch)
treea9ef29d6110b1f5d458a0f33a209c009133ca880 /contrib/cirrus
parente471bf532c751c4f775d8d9f5f8bba35104acbb5 (diff)
parent4b359e4598ec795b8eff3dfebae52b17c195c22b (diff)
downloadpodman-3853ef9b598b82115c1609957169614b26320a26.tar.gz
podman-3853ef9b598b82115c1609957169614b26320a26.tar.bz2
podman-3853ef9b598b82115c1609957169614b26320a26.zip
Merge pull request #13540 from mheon/fix_11822
Deduplicate between Volumes and Mounts in compat API
Diffstat (limited to 'contrib/cirrus')
-rwxr-xr-xcontrib/cirrus/runner.sh4
-rwxr-xr-xcontrib/cirrus/setup_environment.sh5
2 files changed, 9 insertions, 0 deletions
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
index d1d87ad04..1bff07203 100755
--- a/contrib/cirrus/runner.sh
+++ b/contrib/cirrus/runner.sh
@@ -63,6 +63,10 @@ function _run_compose() {
./test/compose/test-compose |& logformatter
}
+function _run_compose_v2() {
+ ./test/compose/test-compose |& logformatter
+}
+
function _run_int() {
dotest integration
}
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 696560166..864c78484 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -272,6 +272,11 @@ case "$TEST_FLAVOR" in
;;
build) make clean ;;
unit) ;;
+ compose_v2)
+ 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)
msg "Installing previously downloaded/cached packages"
dnf install -y $PACKAGE_DOWNLOAD_DIR/python3*.rpm