From 2c61ee9a311a7b3e261194847954447b139d0670 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Thu, 18 Apr 2024 14:14:09 +0200 Subject: [PATCH] CI: remove compose v1 tests compose v1 has been deprecated for some time now, since July 2023 it no longer receives any updates[1]. As such testing it on every PR is pointless, it also does not provide any more coverage then compose v2. At least I never saw only compose v1 test fails (except for flakes) so it doesn't help us to catch regressions. We tried to remove it before but decided against it at that time[2]. [1] https://docs.docker.com/compose/migrate/ [2] https://github.com/containers/podman/issues/18688 Signed-off-by: Paul Holzinger --- .cirrus.yml | 9 +-------- contrib/cirrus/runner.sh | 6 ------ contrib/cirrus/setup_environment.sh | 5 ----- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index bbd79606e6..cd7841180f 100644 --- a/.cirrus.yml +++ b/.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 diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index cf79bb6c91..0a063f96ae 100755 --- a/contrib/cirrus/runner.sh +++ b/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 diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 024638dacf..d836674efd 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/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 ;&