From b659678d6378c12f9fc0a6b870d7e70a3ac33f3a Mon Sep 17 00:00:00 2001
From: Valentin Rothberg <vrothberg@redhat.com>
Date: Thu, 21 Apr 2022 11:17:27 +0200
Subject: [PATCH] cirrus: disable apiv2 task

Business as usual.  It's flaky and we agreed to only run the system
tests.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
---
 .cirrus.yml | 56 ++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 8ce4ad20f5..e9eca00dee 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -411,32 +411,32 @@ unit_test_task:
     always: *runner_stats
 
 
-apiv2_test_task:
-    name: "APIv2 test on $DISTRO_NV"
-    alias: apiv2_test
-    skip: *tags
-    depends_on:
-        - validate
-    gce_instance: *standardvm
-    env:
-        <<: *stdenvars
-        TEST_FLAVOR: apiv2
-    clone_script: *noop  # Comes from cache
-    gopath_cache: *ro_gopath_cache
-    setup_script: *setup
-    main_script: *main
-    always: &logs_artifacts
-        <<: *runner_stats
-        # Required for `contrib/cirrus/logformatter` to work properly
-        html_artifacts:
-            path: ./*.html
-            type: text/html
-        package_versions_script: '$SCRIPT_BASE/logcollector.sh packages'
-        df_script: '$SCRIPT_BASE/logcollector.sh df'
-        audit_log_script: '$SCRIPT_BASE/logcollector.sh audit'
-        journal_script: '$SCRIPT_BASE/logcollector.sh journal'
-        podman_system_info_script: '$SCRIPT_BASE/logcollector.sh podman'
-        time_script: '$SCRIPT_BASE/logcollector.sh time'
+#apiv2_test_task:
+#    name: "APIv2 test on $DISTRO_NV"
+#    alias: apiv2_test
+#    skip: *tags
+#    depends_on:
+#        - validate
+#    gce_instance: *standardvm
+#    env:
+#        <<: *stdenvars
+#        TEST_FLAVOR: apiv2
+#    clone_script: *noop  # Comes from cache
+#    gopath_cache: *ro_gopath_cache
+#    setup_script: *setup
+#    main_script: *main
+#    always: &logs_artifacts
+#        <<: *runner_stats
+#        # Required for `contrib/cirrus/logformatter` to work properly
+#        html_artifacts:
+#            path: ./*.html
+#            type: text/html
+#        package_versions_script: '$SCRIPT_BASE/logcollector.sh packages'
+#        df_script: '$SCRIPT_BASE/logcollector.sh df'
+#        audit_log_script: '$SCRIPT_BASE/logcollector.sh audit'
+#        journal_script: '$SCRIPT_BASE/logcollector.sh journal'
+#        podman_system_info_script: '$SCRIPT_BASE/logcollector.sh podman'
+#        time_script: '$SCRIPT_BASE/logcollector.sh time'
 
 
 # Execute the podman integration tests on all primary platforms and release
@@ -549,7 +549,8 @@ local_system_test_task: &local_system_test_task
     gopath_cache: *ro_gopath_cache
     setup_script: *setup
     main_script: *main
-    always: *logs_artifacts
+    always: &logs_artifacts
+        <<: *runner_stats
 
 
 remote_system_test_task:
@@ -684,7 +685,6 @@ success_task:
         - osx_alt_build
         - docker-py_test
         - unit_test
-        - apiv2_test
         - local_system_test
         - remote_system_test
         - rootless_system_test