From bde3ca8c363bfbd0f50fe9c787960836212e0167 Mon Sep 17 00:00:00 2001
From: Matthew Heon <mheon@redhat.com>
Date: Thu, 17 Mar 2022 14:15:32 -0400
Subject: [PATCH] Add tests with Docker Compose v2

Add a pair of new Cirrus test suites using Compose v2 instead of
Compose v1 (as is currently packaged in Fedora). They work
identically, and run the same tests, as the Compose v1 tests, but
with the new v2 binary instead.

[NO NEW TESTS NEEDED] This adds an entire Cirrus suite...

Signed-off-by: Matthew Heon <mheon@redhat.com>
---
 .cirrus.yml                         | 11 +++++++++--
 contrib/cirrus/runner.sh            |  4 ++++
 contrib/cirrus/setup_environment.sh |  5 +++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 7e523c4aea..0752901abc 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -429,7 +429,7 @@ apiv2_test_task:
 
 
 compose_test_task:
-    name: "compose test on $DISTRO_NV ($PRIV_NAME)"
+    name: "$TEST_FLAVOR test on $DISTRO_NV ($PRIV_NAME)"
     alias: compose_test
     only_if: *not_build
     skip: *tags
@@ -438,11 +438,18 @@ compose_test_task:
     gce_instance: *standardvm
     env:
         <<: *stdenvars
-        TEST_FLAVOR: compose
     matrix:
       - env:
+            TEST_FLAVOR: compose
             PRIV_NAME: root
       - env:
+            TEST_FLAVOR: compose
+            PRIV_NAME: rootless
+      - env:
+            TEST_FLAVOR: compose_v2
+            PRIV_NAME: root
+      - env:
+            TEST_FLAVOR: compose_v2
             PRIV_NAME: rootless
     clone_script: *noop  # Comes from cache
     gopath_cache: *ro_gopath_cache
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
index d1d87ad043..1bff072030 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 696560166a..864c784846 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