From 0f4278c4211974e4d2efa57214e6c16edc4356e7 Mon Sep 17 00:00:00 2001
From: William Blevins <william.blevins@block.one>
Date: Fri, 28 Jan 2022 10:00:00 -0500
Subject: [PATCH] Split pinned and unpinned base image pipelines.

---
 ...base-images.yml => base-images-pinned.yml} | 68 ++-----------------
 .cicd/base-images-unpinned.yml                | 62 +++++++++++++++++
 2 files changed, 66 insertions(+), 64 deletions(-)
 rename .cicd/{base-images.yml => base-images-pinned.yml} (53%)
 create mode 100644 .cicd/base-images-unpinned.yml

diff --git a/.cicd/base-images.yml b/.cicd/base-images-pinned.yml
similarity index 53%
rename from .cicd/base-images.yml
rename to .cicd/base-images-pinned.yml
index 7bb7f96e334..f3f1bb7da27 100644
--- a/.cicd/base-images.yml
+++ b/.cicd/base-images-pinned.yml
@@ -12,7 +12,7 @@ steps:
       queue: "automation-eks-eos-builder-fleet"
     timeout: 180
     skip: ${SKIP_AMAZON_LINUX_2}${SKIP_LINUX}
-    
+
   - label: ":centos: CentOS 7.7 - Base Image Pinned"
     command:
       - "./.cicd/generate-base-images.sh"
@@ -24,7 +24,7 @@ steps:
       queue: "automation-eks-eos-builder-fleet"
     timeout: 180
     skip: ${SKIP_CENTOS_7_7}${SKIP_LINUX}
-    
+
   - label: ":darwin: macOS 10.14 - Base Image Pinned"
     command:
       - "git clone git@github.com:EOSIO/eos.git eos && cd eos && git checkout -f $BUILDKITE_BRANCH"
@@ -48,7 +48,7 @@ steps:
     agents: "queue=mac-anka-node-fleet"
     timeout: 180
     skip: ${SKIP_MACOS_10_14}${SKIP_MAC}
-    
+
   - label: ":ubuntu: Ubuntu 16.04 - Base Image Pinned"
     command:
       - "./.cicd/generate-base-images.sh"
@@ -60,7 +60,7 @@ steps:
       queue: "automation-eks-eos-builder-fleet"
     timeout: 180
     skip: ${SKIP_UBUNTU_16_04}${SKIP_LINUX}
-    
+
   - label: ":ubuntu: Ubuntu 18.04 - Base Image Pinned"
     command:
       - "./.cicd/generate-base-images.sh"
@@ -72,63 +72,3 @@ steps:
       queue: "automation-eks-eos-builder-fleet"
     timeout: 180
     skip: ${SKIP_UBUNTU_18_04}${SKIP_LINUX}
-
-  - label: ":aws: Amazon_Linux 2 - Base Image Unpinned"
-    command:
-      - "./.cicd/generate-base-images.sh"
-    env:
-      FORCE_BASE_IMAGE: true
-      IMAGE_TAG: amazon_linux-2-unpinned
-      PLATFORM_TYPE: unpinned
-    agents:
-      queue: "automation-eks-eos-builder-fleet"
-    timeout: 180
-    skip: ${SKIP_AMAZON_LINUX_2}${SKIP_LINUX}
-    
-  - label: ":centos: CentOS 7.7 - Base Image Unpinned"
-    command:
-      - "./.cicd/generate-base-images.sh"
-    env:
-      FORCE_BASE_IMAGE: true
-      IMAGE_TAG: centos-7.7-unpinned
-      PLATFORM_TYPE: unpinned
-    agents:
-      queue: "automation-eks-eos-builder-fleet"
-    timeout: 180
-    skip: ${SKIP_CENTOS_7_7}${SKIP_LINUX}
-    
-  - label: ":darwin: macOS 10.14 - Base Image Unpinned"
-    command:
-      - "git clone git@github.com:EOSIO/eos.git eos && cd eos && git checkout -f $BUILDKITE_BRANCH"
-      - "cd eos && ./.cicd/platforms/unpinned/macos-10.14-unpinned.sh"
-    plugins:
-      - EOSIO/anka#v0.6.1:
-          debug: true
-          vm-name: "10.14.6_6C_14G_80G"
-          no-volume: true
-          always-pull: true
-          wait-network: true
-          pre-execute-sleep: 5
-          pre-execute-ping-sleep: github.com
-          vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
-          failover-registries:
-          - "registry_1"
-          - "registry_2"
-          inherit-environment-vars: true
-      - EOSIO/skip-checkout#v0.1.1:
-          cd: ~
-    agents: "queue=mac-anka-node-fleet"
-    timeout: 180
-    skip: ${SKIP_MACOS_10_14}${SKIP_MAC}
-    
-  - label: ":ubuntu: Ubuntu 18.04 - Base Image Unpinned"
-    command:
-      - "./.cicd/generate-base-images.sh"
-    env:
-      FORCE_BASE_IMAGE: true
-      IMAGE_TAG: ubuntu-18.04-unpinned
-      PLATFORM_TYPE: unpinned
-    agents:
-      queue: "automation-eks-eos-builder-fleet"
-    timeout: 180
-    skip: ${SKIP_UBUNTU_18_04}${SKIP_LINUX}
diff --git a/.cicd/base-images-unpinned.yml b/.cicd/base-images-unpinned.yml
new file mode 100644
index 00000000000..0d59c907ce0
--- /dev/null
+++ b/.cicd/base-images-unpinned.yml
@@ -0,0 +1,62 @@
+steps:
+  - wait
+
+  - label: ":aws: Amazon_Linux 2 - Base Image Unpinned"
+    command:
+      - "./.cicd/generate-base-images.sh"
+    env:
+      FORCE_BASE_IMAGE: true
+      IMAGE_TAG: amazon_linux-2-unpinned
+      PLATFORM_TYPE: unpinned
+    agents:
+      queue: "automation-eks-eos-builder-fleet"
+    timeout: 180
+    skip: ${SKIP_AMAZON_LINUX_2}${SKIP_LINUX}
+
+  - label: ":centos: CentOS 7.7 - Base Image Unpinned"
+    command:
+      - "./.cicd/generate-base-images.sh"
+    env:
+      FORCE_BASE_IMAGE: true
+      IMAGE_TAG: centos-7.7-unpinned
+      PLATFORM_TYPE: unpinned
+    agents:
+      queue: "automation-eks-eos-builder-fleet"
+    timeout: 180
+    skip: ${SKIP_CENTOS_7_7}${SKIP_LINUX}
+
+  - label: ":darwin: macOS 10.14 - Base Image Unpinned"
+    command:
+      - "git clone git@github.com:EOSIO/eos.git eos && cd eos && git checkout -f $BUILDKITE_BRANCH"
+      - "cd eos && ./.cicd/platforms/unpinned/macos-10.14-unpinned.sh"
+    plugins:
+      - EOSIO/anka#v0.6.1:
+          debug: true
+          vm-name: "10.14.6_6C_14G_80G"
+          no-volume: true
+          always-pull: true
+          wait-network: true
+          pre-execute-sleep: 5
+          pre-execute-ping-sleep: github.com
+          vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
+          failover-registries:
+          - "registry_1"
+          - "registry_2"
+          inherit-environment-vars: true
+      - EOSIO/skip-checkout#v0.1.1:
+          cd: ~
+    agents: "queue=mac-anka-node-fleet"
+    timeout: 180
+    skip: ${SKIP_MACOS_10_14}${SKIP_MAC}
+
+  - label: ":ubuntu: Ubuntu 18.04 - Base Image Unpinned"
+    command:
+      - "./.cicd/generate-base-images.sh"
+    env:
+      FORCE_BASE_IMAGE: true
+      IMAGE_TAG: ubuntu-18.04-unpinned
+      PLATFORM_TYPE: unpinned
+    agents:
+      queue: "automation-eks-eos-builder-fleet"
+    timeout: 180
+    skip: ${SKIP_UBUNTU_18_04}${SKIP_LINUX}