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

---
 .cicd/base-images-pinned.yml                  | 74 +++++++++++++++++++
 ...se-images.yml => base-images-unpinned.yml} | 72 ------------------
 2 files changed, 74 insertions(+), 72 deletions(-)
 create mode 100644 .cicd/base-images-pinned.yml
 rename .cicd/{base-images.yml => base-images-unpinned.yml} (50%)

diff --git a/.cicd/base-images-pinned.yml b/.cicd/base-images-pinned.yml
new file mode 100644
index 0000000000..fcbdf2b70e
--- /dev/null
+++ b/.cicd/base-images-pinned.yml
@@ -0,0 +1,74 @@
+steps:
+  - wait
+
+  - label: ":aws: Amazon_Linux 2 - Base Image Pinned"
+    command:
+      - "./.cicd/generate-base-images.sh"
+    env:
+      FORCE_BASE_IMAGE: true
+      IMAGE_TAG: amazon_linux-2-pinned
+      PLATFORM_TYPE: pinned
+    agents:
+      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"
+    env:
+      FORCE_BASE_IMAGE: true
+      IMAGE_TAG: centos-7.7-pinned
+      PLATFORM_TYPE: pinned
+    agents:
+      queue: "automation-eks-eos-builder-fleet"
+    timeout: 180
+    skip: ${SKIP_CENTOS_7_7}${SKIP_LINUX}
+
+  - label: ":darwin: macOS 10.15 - Base Image Pinned"
+    command:
+      - "git clone git@github.com:EOSIO/eos.git eos && cd eos && git checkout -f $BUILDKITE_BRANCH"
+      - "cd eos && ./.cicd/platforms/pinned/macos-10.15-pinned.sh"
+    plugins:
+      - EOSIO/anka#v0.6.1:
+          debug: true
+          vm-name: "10.15.5_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_15}${SKIP_MAC}
+
+  - label: ":ubuntu: Ubuntu 18.04 - Base Image Pinned"
+    command:
+      - "./.cicd/generate-base-images.sh"
+    env:
+      FORCE_BASE_IMAGE: true
+      IMAGE_TAG: ubuntu-18.04-pinned
+      PLATFORM_TYPE: pinned
+    agents:
+      queue: "automation-eks-eos-builder-fleet"
+    timeout: 180
+    skip: ${SKIP_UBUNTU_18_04}${SKIP_LINUX}
+
+  - label: ":ubuntu: Ubuntu 20.04 - Base Image Pinned"
+    command:
+      - "./.cicd/generate-base-images.sh"
+    env:
+      FORCE_BASE_IMAGE: true
+      IMAGE_TAG: ubuntu-20.04-pinned
+      PLATFORM_TYPE: pinned
+    agents:
+      queue: "automation-eks-eos-builder-fleet"
+    timeout: 180
+    skip: ${SKIP_UBUNTU_20_04}${SKIP_LINUX}
diff --git a/.cicd/base-images.yml b/.cicd/base-images-unpinned.yml
similarity index 50%
rename from .cicd/base-images.yml
rename to .cicd/base-images-unpinned.yml
index dc3280ecc4..fa0539a4d8 100644
--- a/.cicd/base-images.yml
+++ b/.cicd/base-images-unpinned.yml
@@ -1,78 +1,6 @@
 steps:
   - wait
 
-  - label: ":aws: Amazon_Linux 2 - Base Image Pinned"
-    command:
-      - "./.cicd/generate-base-images.sh"
-    env:
-      FORCE_BASE_IMAGE: true
-      IMAGE_TAG: amazon_linux-2-pinned
-      PLATFORM_TYPE: pinned
-    agents:
-      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"
-    env:
-      FORCE_BASE_IMAGE: true
-      IMAGE_TAG: centos-7.7-pinned
-      PLATFORM_TYPE: pinned
-    agents:
-      queue: "automation-eks-eos-builder-fleet"
-    timeout: 180
-    skip: ${SKIP_CENTOS_7_7}${SKIP_LINUX}
-
-  - label: ":darwin: macOS 10.15 - Base Image Pinned"
-    command:
-      - "git clone git@github.com:EOSIO/eos.git eos && cd eos && git checkout -f $BUILDKITE_BRANCH"
-      - "cd eos && ./.cicd/platforms/pinned/macos-10.15-pinned.sh"
-    plugins:
-      - EOSIO/anka#v0.6.1:
-          debug: true
-          vm-name: "10.15.5_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_15}${SKIP_MAC}
-
-  - label: ":ubuntu: Ubuntu 18.04 - Base Image Pinned"
-    command:
-      - "./.cicd/generate-base-images.sh"
-    env:
-      FORCE_BASE_IMAGE: true
-      IMAGE_TAG: ubuntu-18.04-pinned
-      PLATFORM_TYPE: pinned
-    agents:
-      queue: "automation-eks-eos-builder-fleet"
-    timeout: 180
-    skip: ${SKIP_UBUNTU_18_04}${SKIP_LINUX}
-
-  - label: ":ubuntu: Ubuntu 20.04 - Base Image Pinned"
-    command:
-      - "./.cicd/generate-base-images.sh"
-    env:
-      FORCE_BASE_IMAGE: true
-      IMAGE_TAG: ubuntu-20.04-pinned
-      PLATFORM_TYPE: pinned
-    agents:
-      queue: "automation-eks-eos-builder-fleet"
-    timeout: 180
-    skip: ${SKIP_UBUNTU_20_04}${SKIP_LINUX}
-
   - label: ":aws: Amazon_Linux 2 - Base Image Unpinned"
     command:
       - "./.cicd/generate-base-images.sh"