Cirrus: Remove docker-compose v1 testing

Fixes #18688 Docker compose v1 has long since gone EOL and is no longer supported by upstream. Therefore the only things we're accomplishing by testing it with modern Podman are: Wasting time and inviting flakes. Remove it. Also assert the v2-only support in the test `README.md` and remove all v1-related conditionals. Signed-off-by: Chris Evich <[email protected]>
containers · Jun 27, 2023 · 2f2c8aa · 2f2c8aa
1 parent 3794d06
commit 2f2c8aa
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 31 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -534,12 +534,6 @@ compose_test_task:
         - validate
     gce_instance: *standardvm
     matrix:
-      - env:
-            TEST_FLAVOR: compose
-            PRIV_NAME: root
-      - env:
-            TEST_FLAVOR: compose
-            PRIV_NAME: rootless
       - env:
             TEST_FLAVOR: compose_v2
             PRIV_NAME: root

diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
@@ -55,12 +55,6 @@ function _run_apiv2() {
     ) |& logformatter
 }
 
-function _run_compose() {
-    _bail_if_test_can_be_skipped test/compose
-
-    ./test/compose/test-compose |& logformatter
-}
-
 function _run_compose_v2() {
     _bail_if_test_can_be_skipped test/compose
 

diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
@@ -346,6 +346,10 @@ case "$TEST_FLAVOR" in
         ;;
     compose_v2)
         dnf -y remove docker-compose
+        # TODO: Either move this "install" into CI VM image build scripts
+        # since runtime-installs can be fragile.  Or, configure renovate
+        # to manage the version number since nobody will ever realize to
+        # update it here, on their own.
         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
@@ -357,10 +361,6 @@ case "$TEST_FLAVOR" in
         pip install --upgrade pip
         pip install --requirement $GOSRC/test/apiv2/python/requirements.txt
         ;&  # continue with next item
-    compose)
-        make install.tools
-        dnf install -y podman-docker*
-        ;&  # continue with next item
     int)
         make .install.ginkgo
         ;&

diff --git a/test/compose/README.md b/test/compose/README.md
@@ -1,7 +1,9 @@
-Tests for docker-compose
-========================
+Tests for docker-compose v2
+===========================
 
-This directory contains tests for docker-compose under podman.
+This directory contains tests for docker-compose v2 under podman.
+Note, as of late June/early July 2023, compose v1 is no-longer
+tested (or supported).
 
 Each subdirectory must contain one docker-compose.yml file along with
 all necessary infrastructure for it (e.g. Containerfile, any files

diff --git a/test/compose/ipam_set_ip/tests.sh b/test/compose/ipam_set_ip/tests.sh
@@ -1,9 +1,6 @@
 # -*- bash -*-
 
-ctr_name="ipam_set_ip_test_1"
-if [ "$TEST_FLAVOR" = "compose_v2" ]; then
-    ctr_name="ipam_set_ip-test-1"
-fi
+ctr_name="ipam_set_ip-test-1"
 podman container inspect "$ctr_name" --format '{{ .NetworkSettings.Networks.ipam_set_ip_net1.IPAddress }}'
 is "$output" "10.123.0.253" "$testname : ip address is set"
 podman container inspect "$ctr_name" --format '{{ .NetworkSettings.Networks.ipam_set_ip_net1.MacAddress }}'

diff --git a/test/compose/two_networks/tests.sh b/test/compose/two_networks/tests.sh
@@ -1,9 +1,6 @@
 # -*- bash -*-
 
-ctr_name="two_networks_con1_1"
-if [ "$TEST_FLAVOR" = "compose_v2" ]; then
-    ctr_name="two_networks-con1-1"
-fi
+ctr_name="two_networks-con1-1"
 podman container inspect "$ctr_name" --format '{{len .NetworkSettings.Networks}}'
 is "$output" "2" "$testname : Container is connected to both networks"
 podman container inspect "$ctr_name" --format '{{.NetworkSettings.Networks}}'

diff --git a/test/compose/uptwice/tests.sh b/test/compose/uptwice/tests.sh
@@ -10,8 +10,5 @@ output=$(docker-compose up -d 2>&1)
 # Horrible output check here but we really want to make sure that there are
 # no unexpected warning/errors and the normal messages are send on stderr as
 # well so we cannot check for an empty stderr.
-expected="Recreating uptwice_app_1 ... ${CR}${NL}Recreating uptwice_app_1 ... done$CR"
-if [ "$TEST_FLAVOR" = "compose_v2" ]; then
-    expected="Container uptwice-app-1  Recreate${NL}Container uptwice-app-1  Recreated${NL}Container uptwice-app-1  Starting${NL}Container uptwice-app-1  Started"
-fi
+expected="Container uptwice-app-1  Recreate${NL}Container uptwice-app-1  Recreated${NL}Container uptwice-app-1  Starting${NL}Container uptwice-app-1  Started"
 is "$output" "$expected" "no error output in compose up (#15580)"