From 97eaace7db77ec2d7cf33066f76ed3127abeb27b Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Mon, 28 Jun 2021 16:33:29 -0400
Subject: [PATCH] Cirrus: Rename cross -> osx task, add cross task.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 .cirrus.yml              | 27 ++++++++++++++++++++++++++-
 contrib/cirrus/runner.sh |  4 ++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 557543eb..6ffc25f4 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -66,8 +66,10 @@ validate_task:
         make vendor && hack/tree_status.sh
 
 
-cross_task:
+osx_task:
     only_if: &not_docs $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
+    depends_on:
+        - validate
     macos_instance:
         image: catalina-xcode
     setup_script: |
@@ -84,6 +86,28 @@ cross_task:
         /usr/local/bin/skopeo -v
 
 
+cross_task:
+    alias: cross
+    only_if: *not_docs
+    depends_on:
+        - validate
+    gce_instance:
+        image_project: libpod-218412
+        zone: "us-central1-f"
+        cpu: 2
+        memory: "4Gb"
+        # Required to be 200gig, do not modify - has i/o performance impact
+        # according to gcloud CLI tool warning messages.
+        disk: 200
+        image_name: ${FEDORA_CACHE_IMAGE_NAME}
+    env:
+        BUILDTAGS: 'btrfs_noversion libdm_no_deferred_remove containers_image_openpgp'
+    setup_script: >-
+        "${GOSRC}/${SCRIPT_BASE}/runner.sh" setup
+    cross_script: >-
+        "${GOSRC}/${SCRIPT_BASE}/runner.sh" cross
+
+
 #####
 ##### NOTE: This task is subtantially duplicated in the containers/image
 ##### repository's `.cirrus.yml`.  Changes made here should be fully merged
@@ -161,6 +185,7 @@ success_task:
     # N/B: ALL tasks must be listed here, minus their '_task' suffix.
     depends_on:
         - validate
+        - osx
         - cross
         - test_skopeo
         - meta
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
index 1cd0f177..5c76725a 100755
--- a/contrib/cirrus/runner.sh
+++ b/contrib/cirrus/runner.sh
@@ -57,6 +57,10 @@ _run_build() {
     podmanmake bin/skopeo BUILDTAGS="$BUILDTAGS"
 }
 
+_run_cross() {
+    podmanmake local-cross BUILDTAGS="$BUILDTAGS"
+}
+
 _run_validate() {
     podmanmake validate-local BUILDTAGS="$BUILDTAGS"
 }