Cirrus: Reimplement release archive + upload

The initial implementation was far more complicated than necessary.
Strip out the complexities in favor of a simpler and more direct
approach.

Signed-off-by: Chris Evich <cevich@redhat.com>

1 files changed, 14 insertions, 56 deletions

diff --git a/.cirrus.yml b/.cirrus.yml
index 9f718477f..3c50332e2 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -62,6 +62,10 @@ env:
     GCE_SSH_USERNAME: cirrus-ci
     # Name where this repositories cloud resources are located
     GCP_PROJECT_ID: ENCRYPTED[7c80e728e046b1c76147afd156a32c1c57d4a1ac1eab93b7e68e718c61ca8564fc61fef815952b8ae0a64e7034b8fe4f]
+    RELEASE_GCPJSON: ENCRYPTED[789d8f7e9a5972ce350fd8e60f1032ccbf4a35c3938b604774b711aad280e12c21faf10e25af1e0ba33597ffb9e39e46]
+    RELEASE_GCPNAME: ENCRYPTED[417d50488a4bd197bcc925ba6574de5823b97e68db1a17e3a5fde4bcf26576987345e75f8d9ea1c15a156b4612c072a1]
+    RELEASE_GCPROJECT: ENCRYPTED[7c80e728e046b1c76147afd156a32c1c57d4a1ac1eab93b7e68e718c61ca8564fc61fef815952b8ae0a64e7034b8fe4f]
+
 
 
 # Default VM to use unless set or modified by task
@@ -336,9 +340,8 @@ testing_task:
     unit_test_script: '$SCRIPT_BASE/unit_test.sh |& ${TIMESTAMP}'
     integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}'
     system_test_script: '$SCRIPT_BASE/system_test.sh |& ${TIMESTAMP}'
-    cache_release_archive_script: >-
-        [[ "$TEST_REMOTE_CLIENT" == "false" ]] || \
-            $SCRIPT_BASE/cache_release_archive.sh |& ${TIMESTAMP}
+    build_release_script: '$SCRIPT_BASE/build_release.sh |& ${TIMESTAMP}'
+    upload_release_archive_script: '$SCRIPT_BASE/upload_release_archive.sh |& ${TIMESTAMP}'
 
     on_failure:
         failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
@@ -376,9 +379,6 @@ testing_crun_task:
     unit_test_script: '$SCRIPT_BASE/unit_test.sh |& ${TIMESTAMP}'
     integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}'
     system_test_script: '$SCRIPT_BASE/system_test.sh |& ${TIMESTAMP}'
-    cache_release_archive_script: >-
-        [[ "$TEST_REMOTE_CLIENT" == "false" ]] || \
-            $SCRIPT_BASE/cache_release_archive.sh |& ${TIMESTAMP}
 
     on_failure:
         failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
@@ -459,14 +459,15 @@ special_testing_cross_task:
 
     env:
         matrix:
-            SPECIALMODE: 'windows'  # See docs
-            SPECIALMODE: 'darwin'
+            CROSS_PLATFORM: 'windows'
+            CROSS_PLATFORM: 'darwin'
 
     timeout_in: 20m
 
     networking_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/networking.sh'
     setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
-    cache_release_archive_script: '$SCRIPT_BASE/cache_release_archive.sh |& ${TIMESTAMP}'
+    build_release_script: '$SCRIPT_BASE/build_release.sh |& ${TIMESTAMP}'
+    upload_release_archive_script: '$SCRIPT_BASE/upload_release_archive.sh |& ${TIMESTAMP}'
 
     on_failure:
         failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
@@ -615,6 +616,9 @@ verify_test_built_images_task:
     integration_test_script: >-
         [[ "$PACKER_BUILDER_NAME" == "xfedora-30" ]] || \
             $SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}
+    build_release_script: >-
+        [[ "$PACKER_BUILDER_NAME" == "xfedora-30" ]] || \
+            '$SCRIPT_BASE/build_release.sh |& ${TIMESTAMP}'
     system_test_script: >-
         [[ "$PACKER_BUILDER_NAME" == "xfedora-30" ]] || \
             $SCRIPT_BASE/system_test.sh |& ${TIMESTAMP}
@@ -629,7 +633,7 @@ success_task:
     # it blocks PRs from merging if a depends_on task fails
     only_if: $CIRRUS_BRANCH != $DEST_BRANCH
 
-    # ignores any dependent task conditions, include everything except 'release'
+    # ignores any dependent task conditions
     depends_on:
         - "gating"
         - "vendor"
@@ -660,49 +664,3 @@ success_task:
         memory: 1
 
     success_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/success.sh |& ${TIMESTAMP}'
-
-
-release_task:
-
-    # Never do this when building images
-    only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\*\*\*\s*CIRRUS:\s*TEST\s*IMAGES\s*\*\*\*.*'
-
-    # TODO: Uncomment both to not affect pass/fail status of entire job?
-    # allow_failures: $CI == "true"
-    # skip_notifications: $CI == "true"
-
-    # Must include everything (YAML anchor/alias cannot be used here)
-    depends_on:
-        - "gating"
-        - "vendor"
-        - "varlink_api"
-        - "build_each_commit"
-        - "build_without_cgo"
-        - "meta"
-        - "image_prune"
-        - "testing"
-        - "testing_crun"
-        - "special_testing_rootless"
-        - "special_testing_in_podman"
-        - "special_testing_cgroupv2"
-        - "special_testing_cross"
-        - "special_testing_endpoint"
-        - "test_build_cache_images"
-        - "test_building_snap"
-        - "verify_test_built_images"
-        - "success"
-
-    gce_instance:
-        image_name: "${IMAGE_BUILDER_CACHE_IMAGE_NAME}"
-
-    timeout_in: 30m
-
-    env:
-        GCPJSON: ENCRYPTED[789d8f7e9a5972ce350fd8e60f1032ccbf4a35c3938b604774b711aad280e12c21faf10e25af1e0ba33597ffb9e39e46]
-        GCPNAME: ENCRYPTED[417d50488a4bd197bcc925ba6574de5823b97e68db1a17e3a5fde4bcf26576987345e75f8d9ea1c15a156b4612c072a1]
-        GCPROJECT: ENCRYPTED[7c80e728e046b1c76147afd156a32c1c57d4a1ac1eab93b7e68e718c61ca8564fc61fef815952b8ae0a64e7034b8fe4f]
-
-    uncache_release_archives_script: '$SCRIPT_BASE/uncache_release_archives.sh |& ${TIMESTAMP}'
-
-    on_failure:
-        failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'