Merge pull request #22421 from Luap99/compose-test

CI: remove compose v1 tests

.cirrus.yml

@@ -619,19 +619,12 @@ compose_test_task:
     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
-      - env:
-            TEST_FLAVOR: compose_v2
             PRIV_NAME: rootless
     env:
         <<: *stdenvars
+        TEST_FLAVOR: compose_v2
     clone_script: *get_gosrc
     setup_script: *setup
     main_script: *main

contrib/cirrus/runner.sh

@@ -54,12 +54,6 @@ function _run_apiv2() {
     ) |& logformatter
 }
 
-function _run_compose() {
-    _bail_if_test_can_be_skipped test/compose
-
-    showrun ./test/compose/test-compose |& logformatter
-}
-
 function _run_compose_v2() {
     _bail_if_test_can_be_skipped test/compose
 

contrib/cirrus/setup_environment.sh

@@ -367,11 +367,6 @@ case "$TEST_FLAVOR" in
         showrun pip install --upgrade pip
         showrun pip install --requirement $GOSRC/test/apiv2/python/requirements.txt
         ;&  # continue with next item
-    compose)
-        showrun make install.tools
-        showrun dnf remove -y gvisor-tap-vsock
-        showrun dnf install -y podman-docker*
-        ;&  # continue with next item
     int)
         showrun make .install.ginkgo
         ;&

test/compose/README.md

@@ -1,7 +1,8 @@
-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.
+docker-compose v1 is no longer supported upstream so we no longer test with it.
 
 Each subdirectory must contain one docker-compose.yml file along with
 all necessary infrastructure for it (e.g. Containerfile, any files

test/compose/etc_hosts/tests.sh

@@ -1,9 +1,6 @@
 # -*- bash -*-
 
-ctr_name="etc_hosts_test_1"
+ctr_name="etc_hosts-test-1"
-if [ "$TEST_FLAVOR" = "compose_v2" ]; then
-    ctr_name="etc_hosts-test-1"
-fi
 
 podman exec "$ctr_name" sh -c 'grep "foobar" /etc/hosts'
 like "$output" "10\.123\.0\." "$testname : no entries are copied from the host"

test/compose/ipam_set_ip/tests.sh

@@ -1,9 +1,6 @@
 # -*- bash -*-
 
-ctr_name="ipam_set_ip_test_1"
+ctr_name="ipam_set_ip-test-1"
-if [ "$TEST_FLAVOR" = "compose_v2" ]; then
-    ctr_name="ipam_set_ip-test-1"
-fi
 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 }}'

test/compose/two_networks/tests.sh

@@ -1,9 +1,6 @@
 # -*- bash -*-
 
-ctr_name="two_networks_con1_1"
+ctr_name="two_networks-con1-1"
-if [ "$TEST_FLAVOR" = "compose_v2" ]; then
-    ctr_name="two_networks-con1-1"
-fi
 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}}'

test/compose/uptwice/tests.sh

@@ -10,8 +10,5 @@ output=$(podman_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"
+expected="Container uptwice-app-1  Recreate${NL}Container uptwice-app-1  Recreated${NL}Container uptwice-app-1  Starting${NL}Container uptwice-app-1  Started"
-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
 is "$output" "$expected" "no error output in compose up (#15580)"