From 5a08ddaecc0571ada12848f5d55d1a1085ac1ccf Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Tue, 21 Feb 2023 14:26:16 -0700
Subject: [PATCH] CI: new rootless buildah-bud tests (cron only)

Run rootless bud tests as part of the nightly treadmill job.

Reason: #17480 could have been caught before release.

Also: refactored bot this and bud_test_task (the task which
I copypasted to form this one) to use *stdenvars; thanks
@cevich for catching that.

Signed-off-by: Ed Santiago <santiago@redhat.com>
---
 .cirrus.yml | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 4a185b92fa..a0eb36f5d6 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -834,12 +834,8 @@ buildah_bud_test_task:
         - build
         - local_integration_test
     env:
+        <<: *stdenvars
         TEST_FLAVOR: bud
-        DISTRO_NV: ${FEDORA_NAME}
-        # Not used here, is used in other tasks
-        VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
-        CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
-        CI_DESIRED_NETWORK: netavark
     matrix:
         - env:
             PODBIN_NAME: podman
@@ -852,6 +848,29 @@ buildah_bud_test_task:
     main_script: *main
     always: *int_logs_artifacts
 
+rootless_buildah_bud_test_task:
+    name: *std_name_fmt
+    alias: rootless_buildah_bud_test
+    # Docs: ./contrib/cirrus/CIModes.md
+    only_if: $CIRRUS_CRON == 'treadmill'
+    depends_on:
+        - build
+        - rootless_integration_test
+    env:
+        <<: *stdenvars
+        TEST_FLAVOR: bud
+        PRIV_NAME: rootless
+    matrix:
+        - env:
+            PODBIN_NAME: podman
+        - env:
+            PODBIN_NAME: remote
+    gce_instance: *standardvm
+    timeout_in: 45m
+    clone_script: *get_gosrc
+    setup_script: *setup
+    main_script: *main
+    always: *int_logs_artifacts
 
 upgrade_test_task:
     name: "Upgrade test: from $PODMAN_UPGRADE_FROM"
@@ -997,6 +1016,7 @@ success_task:
         - rootless_remote_system_test
         - minikube_test
         - buildah_bud_test
+        - rootless_buildah_bud_test
         - upgrade_test
         - image_build
         - meta