From defa00696763a4a4035b372fac9f2b1138803b07 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 13:35:03 -0400
Subject: [PATCH 01/52] Create trigger for LRTs.

---
 .cicd/generate-lrt-pipeline.sh | 143 +++++++++++++++++++++++++++++++++
 .cicd/lrts.yml                 |   9 +++
 .cicd/pipeline.yml             |  14 +++-
 3 files changed, 165 insertions(+), 1 deletion(-)
 create mode 100644 .cicd/generate-lrt-pipeline.sh
 create mode 100644 .cicd/lrts.yml

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
new file mode 100644
index 00000000000..a92ee64981e
--- /dev/null
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -0,0 +1,143 @@
+#!/bin/bash
+set -eo pipefail
+. ./.cicd/helpers/general.sh
+export MOJAVE_ANKA_TAG_BASE=${MOJAVE_ANKA_TAG_BASE:-'clean::cicd::git-ssh::nas::brew::buildkite-agent'}
+export MOJAVE_ANKA_TEMPLATE_NAME=${MOJAVE_ANKA_TEMPLATE_NAME:-'10.14.4_6C_14G_40G'}
+# Use files in platforms dir as source of truth for what platforms we need to generate steps for
+export PLATFORMS_JSON_ARRAY='[]'
+for FILE in $(ls $CICD_DIR/platforms); do
+    # Ability to skip mac or linux by not even creating the json block
+    ( [[ $SKIP_MAC == true ]] && [[ $FILE =~ 'macos' ]] ) && continue
+    ( [[ $SKIP_LINUX == true ]] &&    [[ ! $FILE =~ 'macos' ]] ) && continue
+    # Prevent using both platform files (only use unpinned or pinned)
+    if [[ $PINNED == false || $UNPINNED == true ]] && [[ ! $FILE =~ 'macos' ]]; then
+        export SKIP_CONTRACT_BUILDER=${SKIP_CONTRACT_BUILDER:-true}
+        export SKIP_PACKAGE_BUILDER=${SKIP_PACKAGE_BUILDER:-true}
+        [[ ! $FILE =~ 'unpinned' ]] && continue
+    else
+        [[ $FILE =~ 'unpinned' ]] && continue
+    fi
+    export FILE_NAME=$(echo $FILE | awk '{split($0,a,/\.(d|s)/); print a[1] }')
+    export PLATFORM_NAME=$(echo $FILE_NAME | cut -d- -f1 | sed 's/os/OS/g')
+    export PLATFORM_NAME_UPCASE=$(echo $PLATFORM_NAME | tr a-z A-Z)
+    export VERSION_MAJOR=$(echo $FILE_NAME | cut -d- -f2 | cut -d. -f1)
+    [[ $(echo $FILE_NAME | cut -d- -f2) =~ '.' ]] && export VERSION_MINOR="_$(echo $FILE_NAME | cut -d- -f2 | cut -d. -f2)" || export VERSION_MINOR=''
+    export VERSION_FULL=$(echo $FILE_NAME | cut -d- -f2)
+    OLDIFS=$IFS
+    IFS="_"
+    set $PLATFORM_NAME
+    IFS=$OLDIFS
+    export PLATFORM_NAME_FULL="$(capitalize $1)$( [[ ! -z $2 ]] && echo "_$(capitalize $2)" || true ) $VERSION_FULL"
+    [[ $FILE_NAME =~ 'amazon' ]] && export ICON=':aws:'
+    [[ $FILE_NAME =~ 'ubuntu' ]] && export ICON=':ubuntu:'
+    [[ $FILE_NAME =~ 'centos' ]] && export ICON=':centos:'
+    [[ $FILE_NAME =~ 'macos' ]] && export ICON=':darwin:'
+    . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$FILE # returns HASHED_IMAGE_TAG, etc
+    export PLATFORMS_JSON_ARRAY=$(echo $PLATFORMS_JSON_ARRAY | jq -c '. += [{ 
+        "FILE_NAME": env.FILE_NAME, 
+        "PLATFORM_NAME": env.PLATFORM_NAME,
+        "PLATFORM_NAME_UPCASE": env.PLATFORM_NAME_UPCASE,
+        "VERSION_MAJOR": env.VERSION_MAJOR,
+        "VERSION_MINOR": env.VERSION_MINOR,
+        "VERSION_FULL": env.VERSION_FULL,
+        "PLATFORM_NAME_FULL": env.PLATFORM_NAME_FULL,
+        "DOCKERHUB_FULL_TAG": env.FULL_TAG,
+        "HASHED_IMAGE_TAG": env.HASHED_IMAGE_TAG,
+        "ICON": env.ICON
+        }]')
+done
+oIFS="$IFS"
+IFS=$'' 
+nIFS=$IFS # Needed to fix array splitting (\n won't work)
+###################
+# Anka Ensure Tag #
+echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
+    if [[ $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+    cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) Anka - Ensure $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) Template Dependency Tag"
+    command:
+      - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
+      - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'"
+    agents:
+      - "queue=mac-anka-templater-fleet"
+    env:
+      REPO: ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
+      REPO_COMMIT: $BUILDKITE_COMMIT
+      TEMPLATE: $MOJAVE_ANKA_TEMPLATE_NAME
+      TEMPLATE_TAG: $MOJAVE_ANKA_TAG_BASE
+      PINNED: $PINNED
+      UNPINNED: $UNPINNED
+      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && git checkout $BUILDKITE_COMMIT && git submodule update --init --recursive && export PINNED=$PINNED && export UNPINNED=$UNPINNED && . ./.cicd/platforms/macos-10.14.sh && cd ~/eos && cd .. && rm -rf eos"
+      PROJECT_TAG: $(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)
+    timeout: ${TIMEOUT:-320}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_ENSURE_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}
+
+EOF
+    fi
+done
+echo "  - wait"; echo ""
+#############
+# LRT TESTS #
+echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
+    IFS=$oIFS
+    LR_TESTS=$(cat tests/CMakeLists.txt | grep long_running_tests | grep -v "^#" | awk -F" " '{ print $2 }')
+    for TEST_NAME in $LR_TESTS; do
+        if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+            cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} && tar -xzf build.tar.gz"
+      - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
+    env:
+      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-180}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+
+EOF
+        else
+            cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} && tar -xzf build.tar.gz"
+      - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+          always-pull: true
+          debug: true
+          wait-network: true
+    timeout: ${TIMEOUT:-180}
+    agents:
+      - "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+
+EOF
+        fi
+    done
+    IFS=$nIFS
+done
+cat <<EOF
+
+  - wait:
+    continue_on_failure: true
+
+  - label: ":bar_chart: Test Metrics"
+    command: |
+      echo '+++ :compression: Extracting Test Metrics Code'
+      tar -zxf .cicd/metrics/test-metrics.tar.gz
+      echo '+++ :javascript: Running test-metrics.js'
+      node --max-old-space-size=32768 test-metrics.js
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    soft_fail: true
+
+EOF
+IFS=$oIFS
\ No newline at end of file
diff --git a/.cicd/lrts.yml b/.cicd/lrts.yml
new file mode 100644
index 00000000000..7efcf3296c1
--- /dev/null
+++ b/.cicd/lrts.yml
@@ -0,0 +1,9 @@
+steps:
+  - wait
+
+  - label: ":pipeline: Generate Pipeline Steps"  
+    command: "./.cicd/generate-lrt-pipeline.sh | buildkite-agent pipeline upload"
+    agents:
+      queue: "automation-basic-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    
\ No newline at end of file
diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml
index 900aea633e0..77ad63507e9 100644
--- a/.cicd/pipeline.yml
+++ b/.cicd/pipeline.yml
@@ -8,4 +8,16 @@ steps:
       - "buildkite-agent artifact upload generated-pipeline.yml"
     agents:
       queue: "automation-basic-builder-fleet"
-    timeout: ${TIMEOUT:-10}
\ No newline at end of file
+    timeout: ${TIMEOUT:-10}
+
+  - label: ":pipeline: Trigger LRTs"
+    trigger: "eosio-lrts"
+    build:
+      message: "${BUILDKITE_MESSAGE}"
+      commit: "${BUILDKITE_COMMIT}"
+      branch: "${BUILDKITE_BRANCH}"
+      env:
+        BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
+        BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
+        BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
+    skip: ${SKIP_LONG_RUNNING_TESTS:-false}

From 4abf858bd09dc0e6e7a07ce6d0ecafef8c80d8ce Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 13:35:19 -0400
Subject: [PATCH 02/52] Create trigger for LRTs.

---
 .cicd/generate-lrt-pipeline.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 .cicd/generate-lrt-pipeline.sh

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
old mode 100644
new mode 100755

From 9279b695704a7ff7fe672d690baca50779f43cc9 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 13:37:59 -0400
Subject: [PATCH 03/52] Create trigger for LRTs.

---
 .cicd/pipeline.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml
index 77ad63507e9..30aa19b5842 100644
--- a/.cicd/pipeline.yml
+++ b/.cicd/pipeline.yml
@@ -20,4 +20,3 @@ steps:
         BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
         BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
-    skip: ${SKIP_LONG_RUNNING_TESTS:-false}

From 3e04af13f56c79427abe5724c34b9da9cbd4fed9 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 14:07:53 -0400
Subject: [PATCH 04/52] Remove LRT steps from generate-pipeline in favor of
 triggering eosio-lrt pipeline.

---
 .cicd/pipeline.yml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml
index 30aa19b5842..99c2aa488ca 100644
--- a/.cicd/pipeline.yml
+++ b/.cicd/pipeline.yml
@@ -9,14 +9,3 @@ steps:
     agents:
       queue: "automation-basic-builder-fleet"
     timeout: ${TIMEOUT:-10}
-
-  - label: ":pipeline: Trigger LRTs"
-    trigger: "eosio-lrts"
-    build:
-      message: "${BUILDKITE_MESSAGE}"
-      commit: "${BUILDKITE_COMMIT}"
-      branch: "${BUILDKITE_BRANCH}"
-      env:
-        BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
-        BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
-        BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"

From bd7be1edb5994a64da147dbc7cd06a74d42b39ca Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 11 Sep 2019 13:59:30 -0400
Subject: [PATCH 05/52] Eliminate second "Pipeline Upload " step

---
 .cicd/lrts.yml | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 .cicd/lrts.yml

diff --git a/.cicd/lrts.yml b/.cicd/lrts.yml
deleted file mode 100644
index 7efcf3296c1..00000000000
--- a/.cicd/lrts.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-steps:
-  - wait
-
-  - label: ":pipeline: Generate Pipeline Steps"  
-    command: "./.cicd/generate-lrt-pipeline.sh | buildkite-agent pipeline upload"
-    agents:
-      queue: "automation-basic-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    
\ No newline at end of file

From ca85cb779b76b6c8ad69037fc54eed9cef52d07f Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 14:13:00 -0400
Subject: [PATCH 06/52] Fix triggered slug.

---
 .cicd/generate-pipeline.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index d0c15ba9f97..fa1363cbc16 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -317,6 +317,18 @@ EOF
 done
 # pipeline tail
 cat <<EOF
+
+  - label: ":pipeline: Trigger LRTs"
+    trigger: "eosio-lrt"
+    build:
+      message: "${BUILDKITE_MESSAGE}"
+      commit: "${BUILDKITE_COMMIT}"
+      branch: "${BUILDKITE_BRANCH}"
+      env:
+        BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
+        BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
+        BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
+
   - wait:
     continue_on_failure: true
 

From 52fb312c69a3730f611119f8da324e8511f84629 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 14:56:44 -0400
Subject: [PATCH 07/52] Remove LRT skip defaulting to true.

---
 .cicd/generate-lrt-pipeline.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index a92ee64981e..41bc605f7b0 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -94,7 +94,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     agents:
       queue: "automation-eos-builder-fleet"
     timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS}
 
 EOF
         else
@@ -116,7 +116,7 @@ EOF
     timeout: ${TIMEOUT:-180}
     agents:
       - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS}
 
 EOF
         fi

From 6355998379be8d7dc0da2df454830d6ffdef523f Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 15:27:09 -0400
Subject: [PATCH 08/52] Testing containing trigger steps to same
 generate-pipeline.sh.

---
 .cicd/generate-lrt-pipeline.sh | 256 ++++++++++++++++++++++++++++++++-
 .cicd/generate-pipeline.sh     |  13 ++
 2 files changed, 264 insertions(+), 5 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 41bc605f7b0..fee92d8eccd 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -46,6 +46,19 @@ for FILE in $(ls $CICD_DIR/platforms); do
         "ICON": env.ICON
         }]')
 done
+# Triggered LRT
+if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
+    if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
+        export SKIP_BUILD=false
+        export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
+    fi
+    export SKIP_BUILD=${SKIP_BUILD:-true}
+    export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
+    export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
+    export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
+    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+    export SKIP_CONTRACT_BUILDER=true
+fi
 oIFS="$IFS"
 IFS=$'' 
 nIFS=$IFS # Needed to fix array splitting (\n won't work)
@@ -76,6 +89,139 @@ EOF
     fi
 done
 echo "  - wait"; echo ""
+###############
+# BUILD STEPS #
+echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
+    if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+        cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
+    command:
+      - "./.cicd/build.sh"
+      - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
+    env:
+      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-180}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
+
+EOF
+    else
+        cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "cd eos && ./.cicd/build.sh"
+      - "cd eos && tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+          modify-cpu: 12
+          modify-ram: 24
+          always-pull: true
+          debug: true
+          wait-network: true
+    timeout: ${TIMEOUT:-180}
+    agents:
+      - "queue=mac-anka-large-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
+
+EOF
+    fi
+done
+echo "  - wait"; echo ""
+##############
+# UNIT TESTS #
+echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
+    if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+        cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "./.cicd/test.sh scripts/parallel-test.sh"
+    env:
+      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+
+EOF
+    else
+        cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "cd eos && ./.cicd/test.sh scripts/parallel-test.sh"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+          always-pull: true
+          debug: true
+          wait-network: true
+    timeout: ${TIMEOUT:-20}
+    agents:
+      - "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+
+EOF
+    fi
+done
+################
+# SERIAL TESTS #
+echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
+    IFS=$oIFS
+    SERIAL_TESTS=$(cat tests/CMakeLists.txt | grep nonparallelizable_tests | grep -v "^#" | awk -F" " '{ print $2 }')
+    for TEST_NAME in $SERIAL_TESTS; do
+        if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+            cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
+    env:
+      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-20}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+
+EOF
+        else
+            cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "cd eos && ./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+          always-pull: true
+          debug: true
+          wait-network: true
+    timeout: ${TIMEOUT:-20}
+    agents:
+      - "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+EOF
+        fi
+    done
+    IFS=$nIFS
+done
 #############
 # LRT TESTS #
 echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
@@ -86,7 +232,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
             cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} && tar -xzf build.tar.gz"
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' /${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
@@ -94,7 +240,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     agents:
       queue: "automation-eos-builder-fleet"
     timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
 
 EOF
         else
@@ -102,7 +248,7 @@ EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
       - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} && tar -xzf build.tar.gz"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' /${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     plugins:
       - chef/anka#v0.5.1:
@@ -116,8 +262,7 @@ EOF
     timeout: ${TIMEOUT:-180}
     agents:
       - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS}
-
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
 EOF
         fi
     done
@@ -125,6 +270,17 @@ EOF
 done
 cat <<EOF
 
+  - label: ":pipeline: Trigger LRTs"
+    trigger: "eosio-lrt"
+    build:
+      message: "${BUILDKITE_MESSAGE}"
+      commit: "${BUILDKITE_COMMIT}"
+      branch: "${BUILDKITE_BRANCH}"
+      env:
+        BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
+        BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
+        BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
+
   - wait:
     continue_on_failure: true
 
@@ -139,5 +295,95 @@ cat <<EOF
     timeout: ${TIMEOUT:-10}
     soft_fail: true
 
+  - wait
+
+  - label: ":centos: CentOS 7.6 - Package Builder"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step ':centos: CentOS 7.6 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
+      - "./.cicd/package.sh"
+    env:
+      IMAGE_TAG: "centos-7.6"
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+      OS: "el7" # OS and PKGTYPE required for lambdas
+      PKGTYPE: "rpm"
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    skip: ${SKIP_CENTOS_7_6}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
+
+  - label: ":ubuntu: Ubuntu 16.04 - Package Builder"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 16.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
+      - "./.cicd/package.sh"
+    env:
+      IMAGE_TAG: "ubuntu-16.04"
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+      OS: "ubuntu-16.04" # OS and PKGTYPE required for lambdas
+      PKGTYPE: "deb"
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    skip: ${SKIP_UBUNTU_16_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
+
+  - label: ":ubuntu: Ubuntu 18.04 - Package Builder"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 18.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
+      - "./.cicd/package.sh"
+    env:
+      IMAGE_TAG: "ubuntu-18.04"
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+      OS: "ubuntu-18.04" # OS and PKGTYPE required for lambdas
+      PKGTYPE: "deb"
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    skip: ${SKIP_UBUNTU_18_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
+
+  - label: ":darwin: macOS 10.14 - Package Builder"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step ':darwin: macOS 10.14 - Build' && tar -xzf build.tar.gz"
+      - "cd eos && ./.cicd/package.sh"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: 10.14.4_6C_14G_40G
+          vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
+          always-pull: true
+          debug: true
+          wait-network: true
+    agents:
+      - "queue=mac-anka-node-fleet"
+    timeout: ${TIMEOUT:-10}
+    skip: ${SKIP_MACOS_10_14}${SKIP_PACKAGE_BUILDER}${SKIP_MAC}
+
+  - label: ":ubuntu: Ubuntu 18.04 - Contract Builder"
+    command: "./.cicd/installation-build.sh"
+    env:
+      IMAGE_TAG: "ubuntu-18.04-unpinned"
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-30}
+    skip: ${SKIP_CONTRACT_BUILDER}${SKIP_LINUX}
+
+  - wait
+
+  - label: ":git: Git Submodule Regression Check"
+    command: "./.cicd/submodule-regression-check.sh"
+    agents:
+      queue: "automation-basic-builder-fleet"
+    timeout: ${TIMEOUT:-5}
+
+  - label: ":beer: Brew Updater"
+    command: |
+      buildkite-agent artifact download eosio.rb . --step ':darwin: macOS 10.14 - Package Builder'
+      buildkite-agent artifact upload eosio.rb
+    agents:
+      queue: "automation-basic-builder-fleet"
+    timeout: "${TIMEOUT:-5}"
+    skip: ${SKIP_PACKAGE_BUILDER}${SKIP_MAC}${SKIP_MACOS_10_14}
+
 EOF
 IFS=$oIFS
\ No newline at end of file
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index fa1363cbc16..08c75c1fe06 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -51,6 +51,19 @@ for FILE in $(ls $CICD_DIR/platforms); do
         "ICON": env.ICON
         }]')
 done
+# Triggered LRT
+if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
+    if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
+        export SKIP_BUILD=false
+        export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
+    fi
+    export SKIP_BUILD=${SKIP_BUILD:-true}
+    export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
+    export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
+    export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
+    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+    export SKIP_CONTRACT_BUILDER=true
+fi
 oIFS="$IFS"
 IFS=$''
 nIFS=$IFS # fix array splitting (\n won't work)

From 2fe09121b5d2dab53d90f5269c42544916cb32ab Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 15:50:25 -0400
Subject: [PATCH 09/52] Debugging.

---
 .cicd/generate-lrt-pipeline.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index fee92d8eccd..633c891fdb1 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -48,6 +48,7 @@ for FILE in $(ls $CICD_DIR/platforms); do
 done
 # Triggered LRT
 if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
+    echo "slug matched"
     if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
         export SKIP_BUILD=false
         export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
@@ -268,6 +269,7 @@ EOF
     done
     IFS=$nIFS
 done
+
 cat <<EOF
 
   - label: ":pipeline: Trigger LRTs"

From 63bc73426a5eefd35111c2f6ecaa6356ec801681 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 15:53:17 -0400
Subject: [PATCH 10/52] Revert "Debugging."

This reverts commit 86385352448a48c7a1d46669cd40ad1294023fb5.
---
 .cicd/generate-lrt-pipeline.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 633c891fdb1..fee92d8eccd 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -48,7 +48,6 @@ for FILE in $(ls $CICD_DIR/platforms); do
 done
 # Triggered LRT
 if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
-    echo "slug matched"
     if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
         export SKIP_BUILD=false
         export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
@@ -269,7 +268,6 @@ EOF
     done
     IFS=$nIFS
 done
-
 cat <<EOF
 
   - label: ":pipeline: Trigger LRTs"

From 0ff6084728a22816639c3f92c4635f4acc8e5fd1 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 15:59:58 -0400
Subject: [PATCH 11/52] Debugging.

---
 .cicd/generate-lrt-pipeline.sh | 8 ++++----
 .cicd/generate-pipeline.sh     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index fee92d8eccd..48573b14cf2 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -52,10 +52,10 @@ if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
         export SKIP_BUILD=false
         export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
     fi
-    export SKIP_BUILD=${SKIP_BUILD:-true}
-    export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
-    export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
-    export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
+    export SKIP_BUILD=true
+    export SKIP_UNIT_TESTS=true
+    export SKIP_SERIAL_TESTS=true
+    export SKIP_LONG_RUNNING_TESTS=false
     export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
     export SKIP_CONTRACT_BUILDER=true
 fi
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 08c75c1fe06..b59175ba718 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -57,10 +57,10 @@ if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
         export SKIP_BUILD=false
         export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
     fi
-    export SKIP_BUILD=${SKIP_BUILD:-true}
-    export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
-    export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
-    export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
+    export SKIP_BUILD=true
+    export SKIP_UNIT_TESTS=true
+    export SKIP_SERIAL_TESTS=true
+    export SKIP_LONG_RUNNING_TESTS=false
     export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
     export SKIP_CONTRACT_BUILDER=true
 fi

From 35b7a03ac1d012a9b6a2d8b0141f405fa9fc7046 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 16:02:15 -0400
Subject: [PATCH 12/52] Debugging.

---
 .cicd/generate-lrt-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 48573b14cf2..86bd160463b 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -57,7 +57,7 @@ if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
     export SKIP_SERIAL_TESTS=true
     export SKIP_LONG_RUNNING_TESTS=false
     export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
-    export SKIP_CONTRACT_BUILDER=true
+    # export SKIP_CONTRACT_BUILDER=true
 fi
 oIFS="$IFS"
 IFS=$'' 

From 0bb42931412a723d7f32461ccad69b8882d4d027 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 16:09:32 -0400
Subject: [PATCH 13/52] Debugging.

---
 .cicd/generate-lrt-pipeline.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 86bd160463b..344d3d263d6 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -57,7 +57,8 @@ if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
     export SKIP_SERIAL_TESTS=true
     export SKIP_LONG_RUNNING_TESTS=false
     export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
-    # export SKIP_CONTRACT_BUILDER=true
+    export SKIP_CONTRACT_BUILDER=true
+    export SKIP_PACKAGE_BUILDER=true
 fi
 oIFS="$IFS"
 IFS=$'' 

From ff90b801f5cb0e86ea6c6390e40151810e98aa9e Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 16:16:29 -0400
Subject: [PATCH 14/52] Debugging.

---
 .cicd/generate-lrt-pipeline.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 344d3d263d6..1a941d5af06 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -48,17 +48,17 @@ for FILE in $(ls $CICD_DIR/platforms); do
 done
 # Triggered LRT
 if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
-    if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
-        export SKIP_BUILD=false
-        export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
-    fi
+    # if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
+    #     export SKIP_BUILD=false
+    #     export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
+    # fi
     export SKIP_BUILD=true
-    export SKIP_UNIT_TESTS=true
-    export SKIP_SERIAL_TESTS=true
-    export SKIP_LONG_RUNNING_TESTS=false
-    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
-    export SKIP_CONTRACT_BUILDER=true
-    export SKIP_PACKAGE_BUILDER=true
+    # export SKIP_UNIT_TESTS=true
+    # export SKIP_SERIAL_TESTS=true
+    # export SKIP_LONG_RUNNING_TESTS=false
+    # export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+    # export SKIP_CONTRACT_BUILDER=true
+    # export SKIP_PACKAGE_BUILDER=true
 fi
 oIFS="$IFS"
 IFS=$'' 
@@ -105,7 +105,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     agents:
       queue: "automation-eos-builder-fleet"
     timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_BUILD}
 
 EOF
     else
@@ -129,7 +129,7 @@ EOF
     timeout: ${TIMEOUT:-180}
     agents:
       - "queue=mac-anka-large-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_BUILD}
 
 EOF
     fi

From 420973d69ddf2e8737d0b360de1e1b6c77ab3d05 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 16:32:47 -0400
Subject: [PATCH 15/52] Debugging.

---
 .cicd/generate-lrt-pipeline.sh | 20 ++++++++++----------
 .cicd/generate-pipeline.sh     |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 1a941d5af06..e3c14e30e63 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -48,15 +48,15 @@ for FILE in $(ls $CICD_DIR/platforms); do
 done
 # Triggered LRT
 if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
-    # if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
-    #     export SKIP_BUILD=false
-    #     export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
-    # fi
+    if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
+        export SKIP_BUILD=false
+        export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
+    fi
     export SKIP_BUILD=true
     # export SKIP_UNIT_TESTS=true
     # export SKIP_SERIAL_TESTS=true
     # export SKIP_LONG_RUNNING_TESTS=false
-    # export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
     # export SKIP_CONTRACT_BUILDER=true
     # export SKIP_PACKAGE_BUILDER=true
 fi
@@ -150,7 +150,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     agents:
       queue: "automation-eos-builder-fleet"
     timeout: ${TIMEOUT:-10}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 
 EOF
     else
@@ -172,7 +172,7 @@ EOF
     timeout: ${TIMEOUT:-20}
     agents:
       - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 
 EOF
     fi
@@ -195,7 +195,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     agents:
       queue: "automation-eos-builder-fleet"
     timeout: ${TIMEOUT:-20}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 
 EOF
         else
@@ -217,7 +217,7 @@ EOF
     timeout: ${TIMEOUT:-20}
     agents:
       - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 EOF
         fi
     done
@@ -263,7 +263,7 @@ EOF
     timeout: ${TIMEOUT:-180}
     agents:
       - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 EOF
         fi
     done
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index b59175ba718..bba901e3174 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -341,6 +341,7 @@ cat <<EOF
         BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
         BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
+        SKIP_BUILD: "true"
 
   - wait:
     continue_on_failure: true

From 0e925b42ae663b20a28ffdab4a97814d624f6206 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 16:35:49 -0400
Subject: [PATCH 16/52] Debugging.

---
 .cicd/generate-lrt-pipeline.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index e3c14e30e63..fb7e59762d6 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -52,10 +52,10 @@ if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
         export SKIP_BUILD=false
         export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
     fi
-    export SKIP_BUILD=true
-    # export SKIP_UNIT_TESTS=true
-    # export SKIP_SERIAL_TESTS=true
-    # export SKIP_LONG_RUNNING_TESTS=false
+    export SKIP_BUILD=${SKIP_BUILD:-true}
+    export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
+    export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
+    export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
     export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
     # export SKIP_CONTRACT_BUILDER=true
     # export SKIP_PACKAGE_BUILDER=true

From 664d7e2eaf9dba6030c5d42b704e33bc208a8a65 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 16:38:29 -0400
Subject: [PATCH 17/52] Debugging.

---
 .cicd/generate-lrt-pipeline.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index fb7e59762d6..86883bc58d3 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -241,7 +241,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     agents:
       queue: "automation-eos-builder-fleet"
     timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 
 EOF
         else
@@ -281,6 +281,7 @@ cat <<EOF
         BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
         BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
+        SKIP_BUILD: "true"
 
   - wait:
     continue_on_failure: true

From 6748ec5a09fe0495fa659921e843d34e06c9aaf8 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 16:58:52 -0400
Subject: [PATCH 18/52] Add logic to only trigger if not already triggered.

---
 .cicd/generate-lrt-pipeline.sh | 13 ++++++---
 .cicd/generate-pipeline.sh     | 50 ++++++++++++++++++++--------------
 2 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 86883bc58d3..cf55e1bf350 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -57,8 +57,8 @@ if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
     export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
     export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
     export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
-    # export SKIP_CONTRACT_BUILDER=true
-    # export SKIP_PACKAGE_BUILDER=true
+    export SKIP_CONTRACT_BUILDER=true
+    export SKIP_PACKAGE_BUILDER=true
 fi
 oIFS="$IFS"
 IFS=$'' 
@@ -269,8 +269,10 @@ EOF
     done
     IFS=$nIFS
 done
-cat <<EOF
-
+#############
+# LRT TESTS #
+if [[ ! -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $SKIP_LONG_RUNNING_TESTS == false ]]; then
+    cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"
     build:
@@ -283,6 +285,9 @@ cat <<EOF
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
         SKIP_BUILD: "true"
 
+EOF
+fi
+cat <<EOF
   - wait:
     continue_on_failure: true
 
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index bba901e3174..ed27eecc6f2 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -57,12 +57,13 @@ if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
         export SKIP_BUILD=false
         export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
     fi
-    export SKIP_BUILD=true
-    export SKIP_UNIT_TESTS=true
-    export SKIP_SERIAL_TESTS=true
-    export SKIP_LONG_RUNNING_TESTS=false
+    export SKIP_BUILD=${SKIP_BUILD:-true}
+    export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
+    export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
+    export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
     export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
     export SKIP_CONTRACT_BUILDER=true
+    export SKIP_PACKAGE_BUILDER=true
 fi
 oIFS="$IFS"
 IFS=$''
@@ -115,7 +116,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
     agents:
       queue: "$BUILDKITE_AGENT_QUEUE"
     timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_BUILD}
 
 EOF
     else
@@ -139,8 +140,10 @@ EOF
           debug: true
           wait-network: true
     timeout: ${TIMEOUT:-180}
-    agents: "queue=mac-anka-large-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
+    agents:
+      - "queue=mac-anka-large-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_BUILD}
+
 EOF
     fi
     if [ "$BUILDKITE_SOURCE" = 'schedule' ]; then
@@ -175,7 +178,7 @@ for ROUND in $(seq 1 $ROUNDS); do
     agents:
       queue: "$BUILDKITE_AGENT_QUEUE"
     timeout: ${TIMEOUT:-10}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 
 EOF
         else
@@ -197,8 +200,10 @@ EOF
           debug: true
           wait-network: true
     timeout: ${TIMEOUT:-20}
-    agents: "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+    agents:
+      - "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
+
 EOF
         fi
         if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
@@ -229,7 +234,7 @@ EOF
     agents:
       queue: "$BUILDKITE_AGENT_QUEUE"
     timeout: ${TIMEOUT:-20}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 
 EOF
             else
@@ -251,9 +256,9 @@ EOF
           debug: true
           wait-network: true
     timeout: ${TIMEOUT:-20}
-    agents: "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
-
+    agents:
+      - "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 EOF
             fi
             if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
@@ -286,7 +291,7 @@ EOF
     agents:
       queue: "$BUILDKITE_AGENT_QUEUE"
     timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 
 EOF
             else
@@ -308,8 +313,9 @@ EOF
           debug: true
           wait-network: true
     timeout: ${TIMEOUT:-180}
-    agents: "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+    agents:
+      - "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 EOF
             fi
             if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
@@ -328,9 +334,10 @@ EOF
         echo ''
     fi
 done
-# pipeline tail
-cat <<EOF
-
+#############
+# LRT TESTS #
+if [[ ! -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $SKIP_LONG_RUNNING_TESTS == false ]]; then
+    cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"
     build:
@@ -343,6 +350,9 @@ cat <<EOF
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
         SKIP_BUILD: "true"
 
+EOF
+fi
+cat <<EOF
   - wait:
     continue_on_failure: true
 

From 4ee5f53c3ed975fc12f78111ee9ed7ffbc8eeda7 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 17:05:09 -0400
Subject: [PATCH 19/52] Add logic to only trigger if not already triggered.

---
 .cicd/generate-lrt-pipeline.sh | 4 ++--
 .cicd/generate-pipeline.sh     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index cf55e1bf350..5a73f977c86 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -233,7 +233,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
             cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' /${BUILD_SOURCE} && tar -xzf build.tar.gz"
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
@@ -249,7 +249,7 @@ EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
       - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' /${BUILD_SOURCE} && tar -xzf build.tar.gz"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     plugins:
       - chef/anka#v0.5.1:
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index ed27eecc6f2..18e1bbeebee 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -283,7 +283,7 @@ EOF
                 cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
@@ -301,7 +301,7 @@ EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
       - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     plugins:
       - chef/anka#v0.5.1:
@@ -336,7 +336,7 @@ EOF
 done
 #############
 # LRT TESTS #
-if [[ ! -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $SKIP_LONG_RUNNING_TESTS == false ]]; then
+if [[ ! -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From 98f91359ee36a65e5944909b8d31e6f9eb0bac58 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 17:09:01 -0400
Subject: [PATCH 20/52] Add logic to only trigger if not already triggered.

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 18e1bbeebee..4e0be60c2be 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -336,7 +336,7 @@ EOF
 done
 #############
 # LRT TESTS #
-if [[ ! -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID ]]; then
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From 5797e558ef8e674dc733d7f99d7bfde4aa49378f Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 17:10:03 -0400
Subject: [PATCH 21/52] Add logic to only trigger if not already triggered.

---
 .cicd/generate-lrt-pipeline.sh | 8 ++++----
 .cicd/generate-pipeline.sh     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 5a73f977c86..8e5ada0a9f5 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -233,7 +233,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
             cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' /${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
@@ -269,9 +269,9 @@ EOF
     done
     IFS=$nIFS
 done
-#############
-# LRT TESTS #
-if [[ ! -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $SKIP_LONG_RUNNING_TESTS == false ]]; then
+###############
+# TRIGGER LRT #
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $SKIP_LONG_RUNNING_TESTS == false ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 4e0be60c2be..4607d9dd6d0 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -283,7 +283,7 @@ EOF
                 cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' /${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
@@ -334,9 +334,9 @@ EOF
         echo ''
     fi
 done
-#############
-# LRT TESTS #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID ]]; then
+###############
+# TRIGGER LRT #
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $SKIP_LONG_RUNNING_TESTS == false ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From f5db605ecb33f11ee790ad4ea74e413d5665029a Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 17:43:43 -0400
Subject: [PATCH 22/52] Adjust trigger logic.

---
 .cicd/generate-lrt-pipeline.sh | 6 ++----
 .cicd/generate-pipeline.sh     | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 8e5ada0a9f5..62a4001c99e 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -49,14 +49,12 @@ done
 # Triggered LRT
 if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
     if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
-        export SKIP_BUILD=false
         export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
     fi
-    export SKIP_BUILD=${SKIP_BUILD:-true}
+    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
     export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
     export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
     export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
-    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
     export SKIP_CONTRACT_BUILDER=true
     export SKIP_PACKAGE_BUILDER=true
 fi
@@ -271,7 +269,7 @@ EOF
 done
 ###############
 # TRIGGER LRT #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $SKIP_LONG_RUNNING_TESTS == false ]]; then
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 4607d9dd6d0..bf7d4fb30b9 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -54,14 +54,12 @@ done
 # Triggered LRT
 if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
     if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
-        export SKIP_BUILD=false
         export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
     fi
-    export SKIP_BUILD=${SKIP_BUILD:-true}
+    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
     export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
     export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
     export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
-    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
     export SKIP_CONTRACT_BUILDER=true
     export SKIP_PACKAGE_BUILDER=true
 fi
@@ -336,7 +334,7 @@ EOF
 done
 ###############
 # TRIGGER LRT #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $SKIP_LONG_RUNNING_TESTS == false ]]; then
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From c2865fa2eccd0d2b981fb64f148448b2aaabc329 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 09:26:10 -0400
Subject: [PATCH 23/52] Adjust trigger logic.

---
 .cicd/generate-lrt-pipeline.sh | 2 +-
 .cicd/generate-pipeline.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 62a4001c99e..c321a02d6e4 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -269,7 +269,7 @@ EOF
 done
 ###############
 # TRIGGER LRT #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID ]]; then
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index bf7d4fb30b9..e20a5cb0ddb 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -334,7 +334,7 @@ EOF
 done
 ###############
 # TRIGGER LRT #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID ]]; then
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From 6aaeaf8ce1a21017e1471176df8c173ee3acb3ea Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 09:30:43 -0400
Subject: [PATCH 24/52] Adjust trigger logic.

---
 .cicd/generate-lrt-pipeline.sh | 2 +-
 .cicd/generate-pipeline.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index c321a02d6e4..e1410f34789 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -269,7 +269,7 @@ EOF
 done
 ###############
 # TRIGGER LRT #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index e20a5cb0ddb..eafae4a78e9 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -334,7 +334,7 @@ EOF
 done
 ###############
 # TRIGGER LRT #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From 57be1bff1c067ab306e9177764b20a447976e0a3 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 09:54:14 -0400
Subject: [PATCH 25/52] Adjust trigger logic.

---
 .cicd/generate-lrt-pipeline.sh | 2 +-
 .cicd/generate-pipeline.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index e1410f34789..f2124055c2d 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -231,7 +231,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
             cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' /${BUILD_SOURCE} && tar -xzf build.tar.gz"
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index eafae4a78e9..72b204248d2 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -281,7 +281,7 @@ EOF
                 cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' /${BUILD_SOURCE} && tar -xzf build.tar.gz"
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)

From 3fc1fcbb377914d843bdc5082200d88e2fbdacd4 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 10:21:36 -0400
Subject: [PATCH 26/52] Removed separate script in favor of conditional logic
 in  generate-pipeline.sh.

---
 .cicd/generate-lrt-pipeline.sh | 394 ---------------------------------
 1 file changed, 394 deletions(-)
 delete mode 100755 .cicd/generate-lrt-pipeline.sh

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
deleted file mode 100755
index f2124055c2d..00000000000
--- a/.cicd/generate-lrt-pipeline.sh
+++ /dev/null
@@ -1,394 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-. ./.cicd/helpers/general.sh
-export MOJAVE_ANKA_TAG_BASE=${MOJAVE_ANKA_TAG_BASE:-'clean::cicd::git-ssh::nas::brew::buildkite-agent'}
-export MOJAVE_ANKA_TEMPLATE_NAME=${MOJAVE_ANKA_TEMPLATE_NAME:-'10.14.4_6C_14G_40G'}
-# Use files in platforms dir as source of truth for what platforms we need to generate steps for
-export PLATFORMS_JSON_ARRAY='[]'
-for FILE in $(ls $CICD_DIR/platforms); do
-    # Ability to skip mac or linux by not even creating the json block
-    ( [[ $SKIP_MAC == true ]] && [[ $FILE =~ 'macos' ]] ) && continue
-    ( [[ $SKIP_LINUX == true ]] &&    [[ ! $FILE =~ 'macos' ]] ) && continue
-    # Prevent using both platform files (only use unpinned or pinned)
-    if [[ $PINNED == false || $UNPINNED == true ]] && [[ ! $FILE =~ 'macos' ]]; then
-        export SKIP_CONTRACT_BUILDER=${SKIP_CONTRACT_BUILDER:-true}
-        export SKIP_PACKAGE_BUILDER=${SKIP_PACKAGE_BUILDER:-true}
-        [[ ! $FILE =~ 'unpinned' ]] && continue
-    else
-        [[ $FILE =~ 'unpinned' ]] && continue
-    fi
-    export FILE_NAME=$(echo $FILE | awk '{split($0,a,/\.(d|s)/); print a[1] }')
-    export PLATFORM_NAME=$(echo $FILE_NAME | cut -d- -f1 | sed 's/os/OS/g')
-    export PLATFORM_NAME_UPCASE=$(echo $PLATFORM_NAME | tr a-z A-Z)
-    export VERSION_MAJOR=$(echo $FILE_NAME | cut -d- -f2 | cut -d. -f1)
-    [[ $(echo $FILE_NAME | cut -d- -f2) =~ '.' ]] && export VERSION_MINOR="_$(echo $FILE_NAME | cut -d- -f2 | cut -d. -f2)" || export VERSION_MINOR=''
-    export VERSION_FULL=$(echo $FILE_NAME | cut -d- -f2)
-    OLDIFS=$IFS
-    IFS="_"
-    set $PLATFORM_NAME
-    IFS=$OLDIFS
-    export PLATFORM_NAME_FULL="$(capitalize $1)$( [[ ! -z $2 ]] && echo "_$(capitalize $2)" || true ) $VERSION_FULL"
-    [[ $FILE_NAME =~ 'amazon' ]] && export ICON=':aws:'
-    [[ $FILE_NAME =~ 'ubuntu' ]] && export ICON=':ubuntu:'
-    [[ $FILE_NAME =~ 'centos' ]] && export ICON=':centos:'
-    [[ $FILE_NAME =~ 'macos' ]] && export ICON=':darwin:'
-    . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$FILE # returns HASHED_IMAGE_TAG, etc
-    export PLATFORMS_JSON_ARRAY=$(echo $PLATFORMS_JSON_ARRAY | jq -c '. += [{ 
-        "FILE_NAME": env.FILE_NAME, 
-        "PLATFORM_NAME": env.PLATFORM_NAME,
-        "PLATFORM_NAME_UPCASE": env.PLATFORM_NAME_UPCASE,
-        "VERSION_MAJOR": env.VERSION_MAJOR,
-        "VERSION_MINOR": env.VERSION_MINOR,
-        "VERSION_FULL": env.VERSION_FULL,
-        "PLATFORM_NAME_FULL": env.PLATFORM_NAME_FULL,
-        "DOCKERHUB_FULL_TAG": env.FULL_TAG,
-        "HASHED_IMAGE_TAG": env.HASHED_IMAGE_TAG,
-        "ICON": env.ICON
-        }]')
-done
-# Triggered LRT
-if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
-    if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
-        export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
-    fi
-    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
-    export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
-    export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
-    export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
-    export SKIP_CONTRACT_BUILDER=true
-    export SKIP_PACKAGE_BUILDER=true
-fi
-oIFS="$IFS"
-IFS=$'' 
-nIFS=$IFS # Needed to fix array splitting (\n won't work)
-###################
-# Anka Ensure Tag #
-echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
-    if [[ $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
-    cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) Anka - Ensure $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) Template Dependency Tag"
-    command:
-      - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
-      - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'"
-    agents:
-      - "queue=mac-anka-templater-fleet"
-    env:
-      REPO: ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
-      REPO_COMMIT: $BUILDKITE_COMMIT
-      TEMPLATE: $MOJAVE_ANKA_TEMPLATE_NAME
-      TEMPLATE_TAG: $MOJAVE_ANKA_TAG_BASE
-      PINNED: $PINNED
-      UNPINNED: $UNPINNED
-      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && git checkout $BUILDKITE_COMMIT && git submodule update --init --recursive && export PINNED=$PINNED && export UNPINNED=$UNPINNED && . ./.cicd/platforms/macos-10.14.sh && cd ~/eos && cd .. && rm -rf eos"
-      PROJECT_TAG: $(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)
-    timeout: ${TIMEOUT:-320}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_ENSURE_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}
-
-EOF
-    fi
-done
-echo "  - wait"; echo ""
-###############
-# BUILD STEPS #
-echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
-    if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
-        cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
-    command:
-      - "./.cicd/build.sh"
-      - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
-    env:
-      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_BUILD}
-
-EOF
-    else
-        cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
-    command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && ./.cicd/build.sh"
-      - "cd eos && tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
-    plugins:
-      - chef/anka#v0.5.1:
-          no-volume: true
-          inherit-environment-vars: true
-          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-          modify-cpu: 12
-          modify-ram: 24
-          always-pull: true
-          debug: true
-          wait-network: true
-    timeout: ${TIMEOUT:-180}
-    agents:
-      - "queue=mac-anka-large-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_BUILD}
-
-EOF
-    fi
-done
-echo "  - wait"; echo ""
-##############
-# UNIT TESTS #
-echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
-    if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
-        cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "./.cicd/test.sh scripts/parallel-test.sh"
-    env:
-      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
-
-EOF
-    else
-        cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
-    command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "cd eos && ./.cicd/test.sh scripts/parallel-test.sh"
-    plugins:
-      - chef/anka#v0.5.1:
-          no-volume: true
-          inherit-environment-vars: true
-          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-          always-pull: true
-          debug: true
-          wait-network: true
-    timeout: ${TIMEOUT:-20}
-    agents:
-      - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
-
-EOF
-    fi
-done
-################
-# SERIAL TESTS #
-echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
-    IFS=$oIFS
-    SERIAL_TESTS=$(cat tests/CMakeLists.txt | grep nonparallelizable_tests | grep -v "^#" | awk -F" " '{ print $2 }')
-    for TEST_NAME in $SERIAL_TESTS; do
-        if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
-            cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
-    env:
-      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-20}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
-
-EOF
-        else
-            cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-    command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "cd eos && ./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
-    plugins:
-      - chef/anka#v0.5.1:
-          no-volume: true
-          inherit-environment-vars: true
-          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-          always-pull: true
-          debug: true
-          wait-network: true
-    timeout: ${TIMEOUT:-20}
-    agents:
-      - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
-EOF
-        fi
-    done
-    IFS=$nIFS
-done
-#############
-# LRT TESTS #
-echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
-    IFS=$oIFS
-    LR_TESTS=$(cat tests/CMakeLists.txt | grep long_running_tests | grep -v "^#" | awk -F" " '{ print $2 }')
-    for TEST_NAME in $LR_TESTS; do
-        if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
-            cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
-      - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
-    env:
-      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
-
-EOF
-        else
-            cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-    command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
-      - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
-    plugins:
-      - chef/anka#v0.5.1:
-          no-volume: true
-          inherit-environment-vars: true
-          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-          always-pull: true
-          debug: true
-          wait-network: true
-    timeout: ${TIMEOUT:-180}
-    agents:
-      - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
-EOF
-        fi
-    done
-    IFS=$nIFS
-done
-###############
-# TRIGGER LRT #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
-    cat <<EOF
-  - label: ":pipeline: Trigger LRTs"
-    trigger: "eosio-lrt"
-    build:
-      message: "${BUILDKITE_MESSAGE}"
-      commit: "${BUILDKITE_COMMIT}"
-      branch: "${BUILDKITE_BRANCH}"
-      env:
-        BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
-        BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
-        BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
-        SKIP_BUILD: "true"
-
-EOF
-fi
-cat <<EOF
-  - wait:
-    continue_on_failure: true
-
-  - label: ":bar_chart: Test Metrics"
-    command: |
-      echo '+++ :compression: Extracting Test Metrics Code'
-      tar -zxf .cicd/metrics/test-metrics.tar.gz
-      echo '+++ :javascript: Running test-metrics.js'
-      node --max-old-space-size=32768 test-metrics.js
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    soft_fail: true
-
-  - wait
-
-  - label: ":centos: CentOS 7.6 - Package Builder"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step ':centos: CentOS 7.6 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
-      - "./.cicd/package.sh"
-    env:
-      IMAGE_TAG: "centos-7.6"
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-      OS: "el7" # OS and PKGTYPE required for lambdas
-      PKGTYPE: "rpm"
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    skip: ${SKIP_CENTOS_7_6}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
-
-  - label: ":ubuntu: Ubuntu 16.04 - Package Builder"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 16.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
-      - "./.cicd/package.sh"
-    env:
-      IMAGE_TAG: "ubuntu-16.04"
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-      OS: "ubuntu-16.04" # OS and PKGTYPE required for lambdas
-      PKGTYPE: "deb"
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    skip: ${SKIP_UBUNTU_16_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
-
-  - label: ":ubuntu: Ubuntu 18.04 - Package Builder"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 18.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
-      - "./.cicd/package.sh"
-    env:
-      IMAGE_TAG: "ubuntu-18.04"
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-      OS: "ubuntu-18.04" # OS and PKGTYPE required for lambdas
-      PKGTYPE: "deb"
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    skip: ${SKIP_UBUNTU_18_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
-
-  - label: ":darwin: macOS 10.14 - Package Builder"
-    command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step ':darwin: macOS 10.14 - Build' && tar -xzf build.tar.gz"
-      - "cd eos && ./.cicd/package.sh"
-    plugins:
-      - chef/anka#v0.5.1:
-          no-volume: true
-          inherit-environment-vars: true
-          vm-name: 10.14.4_6C_14G_40G
-          vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
-          always-pull: true
-          debug: true
-          wait-network: true
-    agents:
-      - "queue=mac-anka-node-fleet"
-    timeout: ${TIMEOUT:-10}
-    skip: ${SKIP_MACOS_10_14}${SKIP_PACKAGE_BUILDER}${SKIP_MAC}
-
-  - label: ":ubuntu: Ubuntu 18.04 - Contract Builder"
-    command: "./.cicd/installation-build.sh"
-    env:
-      IMAGE_TAG: "ubuntu-18.04-unpinned"
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-30}
-    skip: ${SKIP_CONTRACT_BUILDER}${SKIP_LINUX}
-
-  - wait
-
-  - label: ":git: Git Submodule Regression Check"
-    command: "./.cicd/submodule-regression-check.sh"
-    agents:
-      queue: "automation-basic-builder-fleet"
-    timeout: ${TIMEOUT:-5}
-
-  - label: ":beer: Brew Updater"
-    command: |
-      buildkite-agent artifact download eosio.rb . --step ':darwin: macOS 10.14 - Package Builder'
-      buildkite-agent artifact upload eosio.rb
-    agents:
-      queue: "automation-basic-builder-fleet"
-    timeout: "${TIMEOUT:-5}"
-    skip: ${SKIP_PACKAGE_BUILDER}${SKIP_MAC}${SKIP_MACOS_10_14}
-
-EOF
-IFS=$oIFS
\ No newline at end of file

From 03b6258f641a124c86539422ad0310fbbb92b84f Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 10:22:31 -0400
Subject: [PATCH 27/52] Removed vars in favor of Terraform applying at pipeline
 level.

---
 .cicd/generate-pipeline.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 72b204248d2..f29d5273f17 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -57,11 +57,6 @@ if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
         export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
     fi
     export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
-    export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
-    export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
-    export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
-    export SKIP_CONTRACT_BUILDER=true
-    export SKIP_PACKAGE_BUILDER=true
 fi
 oIFS="$IFS"
 IFS=$''

From 5976484a8bdb71187abd2d9ddcd262b384d543ea Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 10:27:54 -0400
Subject: [PATCH 28/52] Logic prep for only triggering on PRs.

---
 .cicd/generate-pipeline.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index f29d5273f17..96f595cf04f 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -327,9 +327,10 @@ EOF
         echo ''
     fi
 done
-###############
-# TRIGGER LRT #
+#####################
+# TRIGGERS ON PR #
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
+# if [[ $BUILDKITE_PULL_REQUEST ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"
@@ -343,6 +344,17 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosi
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
         SKIP_BUILD: "true"
 
+  - label: ":pipeline: Trigger LRTs"
+    trigger: "eos-multiversion-tests"
+    build:
+      message: "${BUILDKITE_MESSAGE}"
+      commit: "${BUILDKITE_COMMIT}"
+      branch: "${BUILDKITE_BRANCH}"
+      env:
+        BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
+        BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
+        BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
+
 EOF
 fi
 cat <<EOF

From 3506d39ae0b76339d1e04280af1a54d2306f86e8 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 10:36:33 -0400
Subject: [PATCH 29/52] Logic prep for only triggering on PRs.

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 96f595cf04f..ad60cb46585 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -330,7 +330,7 @@ done
 #####################
 # TRIGGERS ON PR #
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
-# if [[ $BUILDKITE_PULL_REQUEST ]]; then
+# if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From 5707017945ef2f799ff708b63e2782306add304a Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 10:46:13 -0400
Subject: [PATCH 30/52] Switch logic to run on PRs.

---
 .cicd/generate-pipeline.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index ad60cb46585..36552440dc3 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -329,8 +329,8 @@ EOF
 done
 #####################
 # TRIGGERS ON PR #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
-# if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST ]]; then
+# if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From 00db51d5f77001f2977b264425e9c0947f41721b Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 10:48:43 -0400
Subject: [PATCH 31/52] Switch logic to run on PRs.

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 36552440dc3..4db9519bb64 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -330,7 +330,7 @@ done
 #####################
 # TRIGGERS ON PR #
 # if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST ]]; then
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false" ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From 04970a494fec2ae67f0a006103bbdbdc7211d755 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 10:52:37 -0400
Subject: [PATCH 32/52] Remove slug check in favor of only using trigger check.

---
 .cicd/generate-pipeline.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 4db9519bb64..b2f7089d665 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -52,12 +52,10 @@ for FILE in $(ls $CICD_DIR/platforms); do
         }]')
 done
 # Triggered LRT
-if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
-    if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
-        export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
-    fi
-    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
+    export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
 fi
+export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
 oIFS="$IFS"
 IFS=$''
 nIFS=$IFS # fix array splitting (\n won't work)

From b150508ead5a456f109395c2c1f2939af36b1153 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 10:55:17 -0400
Subject: [PATCH 33/52] Remove old if statement.

---
 .cicd/generate-pipeline.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index b2f7089d665..91c5449383e 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -325,9 +325,8 @@ EOF
         echo ''
     fi
 done
-#####################
+##################
 # TRIGGERS ON PR #
-# if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false" ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"

From 2d05d36098a191467fffd2cd7e1d36ff55e6cb50 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 10:57:41 -0400
Subject: [PATCH 34/52] Fix multiversion trigger label.

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 91c5449383e..6f3eb6a6afc 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -341,7 +341,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
         SKIP_BUILD: "true"
 
-  - label: ":pipeline: Trigger LRTs"
+  - label: ":pipeline: Trigger Multiversion"
     trigger: "eos-multiversion-tests"
     build:
       message: "${BUILDKITE_MESSAGE}"

From 0787091c69ea86e055ed7748c7d641a3213f75c6 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 11:11:30 -0400
Subject: [PATCH 35/52] Pass pinned/unpinned variable for LRTs triggered by
 eosio-unnpinned pipeline.

---
 .cicd/generate-pipeline.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 6f3eb6a6afc..5c6d554d233 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -340,6 +340,8 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false
         BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
         SKIP_BUILD: "true"
+        PINNED: "${PINNED}"
+        UNPINNED: "${UNPINNED}"
 
   - label: ":pipeline: Trigger Multiversion"
     trigger: "eos-multiversion-tests"

From 804002c12c5afd534c10ee0f20109bbfc82a921a Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 11:15:21 -0400
Subject: [PATCH 36/52] Remove newline.

---
 .cicd/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml
index 99c2aa488ca..900aea633e0 100644
--- a/.cicd/pipeline.yml
+++ b/.cicd/pipeline.yml
@@ -8,4 +8,4 @@ steps:
       - "buildkite-agent artifact upload generated-pipeline.yml"
     agents:
       queue: "automation-basic-builder-fleet"
-    timeout: ${TIMEOUT:-10}
+    timeout: ${TIMEOUT:-10}
\ No newline at end of file

From 1e25597a675ffece0590387772f8458e19dc34cb Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 11:58:04 -0400
Subject: [PATCH 37/52] Multiversion shouldn't be called on unpinned build
 trigger.

---
 .cicd/generate-pipeline.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 5c6d554d233..2e413f5a41d 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -325,8 +325,8 @@ EOF
         echo ''
     fi
 done
-##################
-# TRIGGERS ON PR #
+#############
+# LRT ON PR #
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false" ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
@@ -343,6 +343,13 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false
         PINNED: "${PINNED}"
         UNPINNED: "${UNPINNED}"
 
+EOF
+fi
+######################
+# MULTIVERSION ON PR #
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false" ]]; then
+    if ( [[ ! $PINNED == false || $UNPINNED == true ]] ); then
+    cat <<EOF
   - label: ":pipeline: Trigger Multiversion"
     trigger: "eos-multiversion-tests"
     build:
@@ -355,6 +362,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
 
 EOF
+    fi
 fi
 cat <<EOF
   - wait:

From 59534020cb98a09404e44bc4018a94de596dc651 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 14:30:32 -0400
Subject: [PATCH 38/52] Trigger multiversion async so we don't wait for it.

---
 .cicd/generate-pipeline.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 2e413f5a41d..75da523a881 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -352,6 +352,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false
     cat <<EOF
   - label: ":pipeline: Trigger Multiversion"
     trigger: "eos-multiversion-tests"
+    async: true
     build:
       message: "${BUILDKITE_MESSAGE}"
       commit: "${BUILDKITE_COMMIT}"

From 5eb4efff0368263895fb9f5eb8a6dbe070e9d615 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 16:45:03 -0400
Subject: [PATCH 39/52] Set LRTs as async as well.

---
 .cicd/generate-pipeline.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 75da523a881..4e147432ab2 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -331,6 +331,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"
+    async: true
     build:
       message: "${BUILDKITE_MESSAGE}"
       commit: "${BUILDKITE_COMMIT}"

From dc8c6259159c545d3db0288d48b6539cdbb6ca46 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 16:45:35 -0400
Subject: [PATCH 40/52] Unpinned builds don't need to run LRTs on every PR.

---
 .cicd/generate-pipeline.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 4e147432ab2..d14aa73e933 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -328,6 +328,7 @@ done
 #############
 # LRT ON PR #
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false" ]]; then
+    if ( [[ ! $PINNED == false || $UNPINNED == true ]] ); then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From dc9d1c408faeadba4200d308b67e566b34246e15 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 16:52:15 -0400
Subject: [PATCH 41/52] Unpinned builds don't need to run LRTs on every PR.

---
 .cicd/generate-pipeline.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index d14aa73e933..223e5d15292 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -346,6 +346,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false
         UNPINNED: "${UNPINNED}"
 
 EOF
+    fi
 fi
 ######################
 # MULTIVERSION ON PR #

From 4eca0e7dfc3355fc8866b2da9a339a6cbbc65361 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 10:19:35 -0400
Subject: [PATCH 42/52] Concurrency attempt.

---
 .cicd/generate-pipeline.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 223e5d15292..79677d10d82 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -51,7 +51,7 @@ for FILE in $(ls $CICD_DIR/platforms); do
         "ICON": env.ICON
         }]')
 done
-# Triggered LRT
+# set build source whether triggered or not
 if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
     export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
 fi
@@ -137,7 +137,7 @@ EOF
 
 EOF
     fi
-    if [ "$BUILDKITE_SOURCE" = 'schedule' ]; then
+    if [[ "$BUILDKITE_SOURCE" == 'schedule' | "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
         cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -197,7 +197,7 @@ EOF
 
 EOF
         fi
-        if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
+        if [[ "$BUILDKITE_SOURCE" == 'schedule' | "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
             cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -252,7 +252,7 @@ EOF
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 EOF
             fi
-            if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
+            if [[ "$BUILDKITE_SOURCE" == 'schedule' | "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
                 cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -309,7 +309,7 @@ EOF
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 EOF
             fi
-            if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
+            if [[ "$BUILDKITE_SOURCE" == 'schedule' | "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
                 cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -330,7 +330,7 @@ done
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false" ]]; then
     if ( [[ ! $PINNED == false || $UNPINNED == true ]] ); then
     cat <<EOF
-  - label: ":pipeline: Trigger LRTs"
+  - label: ":pipeline: Trigger Long Running Tests"
     trigger: "eosio-lrt"
     async: true
     build:
@@ -353,7 +353,7 @@ fi
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false" ]]; then
     if ( [[ ! $PINNED == false || $UNPINNED == true ]] ); then
     cat <<EOF
-  - label: ":pipeline: Trigger Multiversion"
+  - label: ":pipeline: Trigger Multiversion Test"
     trigger: "eos-multiversion-tests"
     async: true
     build:

From 7bff72d24fce0d6f8747e3d4acc2feabfaf31dba Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 10:21:51 -0400
Subject: [PATCH 43/52] Concurrency attempt.

---
 .cicd/generate-pipeline.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 79677d10d82..c5a0bf467d0 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -137,7 +137,7 @@ EOF
 
 EOF
     fi
-    if [[ "$BUILDKITE_SOURCE" == 'schedule' | "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
+    if [[ "$BUILDKITE_SOURCE" == 'schedule' || "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
         cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -197,7 +197,7 @@ EOF
 
 EOF
         fi
-        if [[ "$BUILDKITE_SOURCE" == 'schedule' | "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
+        if [[ "$BUILDKITE_SOURCE" == 'schedule' || "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
             cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -252,7 +252,7 @@ EOF
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 EOF
             fi
-            if [[ "$BUILDKITE_SOURCE" == 'schedule' | "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
+            if [[ "$BUILDKITE_SOURCE" == 'schedule' || "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
                 cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -309,7 +309,7 @@ EOF
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 EOF
             fi
-            if [[ "$BUILDKITE_SOURCE" == 'schedule' | "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
+            if [[ "$BUILDKITE_SOURCE" == 'schedule' || "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
                 cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}

From 80762d1cf7216ecc17282267f8fc7bdc28c3b1bf Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 10:40:03 -0400
Subject: [PATCH 44/52] Trigger builds don't conflict with scheduled
 concurrency groups.

---
 .cicd/generate-pipeline.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index c5a0bf467d0..72db88c01e2 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -52,10 +52,12 @@ for FILE in $(ls $CICD_DIR/platforms); do
         }]')
 done
 # set build source whether triggered or not
-if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
-    export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
+if [[ ! -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
+    export BUILD_SOURCE="--build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}"
+    LINUX_CONCURRENCY_GROUP="eos-trigger-linux-${BUILDKITE_BUILD_NUMBER}"
+    MAC_CONCURRENCY_GROUP="eos-trigger-mac"
 fi
-export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_BUILD_ID}
 oIFS="$IFS"
 IFS=$''
 nIFS=$IFS # fix array splitting (\n won't work)

From 76e763e4c12f14b5daf549940606bf7525ee6563 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 11:00:10 -0400
Subject: [PATCH 45/52] Fix BUILD_SOURCE on triggered builds.

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 72db88c01e2..f112320231f 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -53,7 +53,7 @@ for FILE in $(ls $CICD_DIR/platforms); do
 done
 # set build source whether triggered or not
 if [[ ! -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
-    export BUILD_SOURCE="--build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}"
+    export BUILD_SOURCE="--build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID"
     LINUX_CONCURRENCY_GROUP="eos-trigger-linux-${BUILDKITE_BUILD_NUMBER}"
     MAC_CONCURRENCY_GROUP="eos-trigger-mac"
 fi

From 7618963982bc13372451109c3a5055052c9ab0f4 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 11:26:53 -0400
Subject: [PATCH 46/52] Only one concurrency group for Linux.

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index f112320231f..d723c43e98e 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -54,7 +54,7 @@ done
 # set build source whether triggered or not
 if [[ ! -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
     export BUILD_SOURCE="--build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID"
-    LINUX_CONCURRENCY_GROUP="eos-trigger-linux-${BUILDKITE_BUILD_NUMBER}"
+    LINUX_CONCURRENCY_GROUP="eos-trigger-linux"
     MAC_CONCURRENCY_GROUP="eos-trigger-mac"
 fi
 export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_BUILD_ID}

From d802cbee12be7a08e9bc60f9799758d3bba3ae5f Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 11:27:08 -0400
Subject: [PATCH 47/52] Empty commit.


From 1296499681b8ca60954f651bb9235f4b4857f561 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 11:45:59 -0400
Subject: [PATCH 48/52] Remove concurrency and trigger on PR in favor of
 triggering post PR.

---
 .cicd/generate-pipeline.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index d723c43e98e..d7653386238 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -51,13 +51,15 @@ for FILE in $(ls $CICD_DIR/platforms); do
         "ICON": env.ICON
         }]')
 done
-# set build source whether triggered or not
+# set build_source whether triggered or not
 if [[ ! -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
     export BUILD_SOURCE="--build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID"
-    LINUX_CONCURRENCY_GROUP="eos-trigger-linux"
-    MAC_CONCURRENCY_GROUP="eos-trigger-mac"
 fi
 export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_BUILD_ID}
+# set trigger_job if master/release/develop branch and webhook
+if [[ $BUILDKITE_BRANCH =~ ^release/[0-9].[0-9]+.x$ || $BUILDKITE_BRANCH =~ ^master$ || $BUILDKITE_BRANCH =~ ^develop$ ]]; then
+    [[ $BUILDKITE_SOURCE == 'webhook' ]] && export TRIGGER_JOB=true
+fi
 oIFS="$IFS"
 IFS=$''
 nIFS=$IFS # fix array splitting (\n won't work)
@@ -139,7 +141,7 @@ EOF
 
 EOF
     fi
-    if [[ "$BUILDKITE_SOURCE" == 'schedule' || "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
+    if [[ "$BUILDKITE_SOURCE" == 'schedule' ]]; then
         cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -199,7 +201,7 @@ EOF
 
 EOF
         fi
-        if [[ "$BUILDKITE_SOURCE" == 'schedule' || "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
+        if [[ "$BUILDKITE_SOURCE" == 'schedule' ]]; then
             cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -254,7 +256,7 @@ EOF
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 EOF
             fi
-            if [[ "$BUILDKITE_SOURCE" == 'schedule' || "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
+            if [[ "$BUILDKITE_SOURCE" == 'schedule' ]]; then
                 cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -311,7 +313,7 @@ EOF
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 EOF
             fi
-            if [[ "$BUILDKITE_SOURCE" == 'schedule' || "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
+            if [[ "$BUILDKITE_SOURCE" == 'schedule' ]]; then
                 cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -327,9 +329,8 @@ EOF
         echo ''
     fi
 done
-#############
-# LRT ON PR #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false" ]]; then
+# trigger eosio-lrt post pr
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB == "true" ]]; then
     if ( [[ ! $PINNED == false || $UNPINNED == true ]] ); then
     cat <<EOF
   - label: ":pipeline: Trigger Long Running Tests"
@@ -350,9 +351,8 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false
 EOF
     fi
 fi
-######################
-# MULTIVERSION ON PR #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false" ]]; then
+# trigger multiversion post pr
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB = "true" ]]; then
     if ( [[ ! $PINNED == false || $UNPINNED == true ]] ); then
     cat <<EOF
   - label: ":pipeline: Trigger Multiversion Test"

From ae747ce93d923e25788447835b474d7b393806bb Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 11:52:26 -0400
Subject: [PATCH 49/52] Finish resetting source checks for concurrency.

---
 .cicd/generate-pipeline.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index d7653386238..30704505915 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -141,7 +141,7 @@ EOF
 
 EOF
     fi
-    if [[ "$BUILDKITE_SOURCE" == 'schedule' ]]; then
+    if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
         cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -201,7 +201,7 @@ EOF
 
 EOF
         fi
-        if [[ "$BUILDKITE_SOURCE" == 'schedule' ]]; then
+        if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
             cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -256,7 +256,7 @@ EOF
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 EOF
             fi
-            if [[ "$BUILDKITE_SOURCE" == 'schedule' ]]; then
+            if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
                 cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -313,7 +313,7 @@ EOF
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 EOF
             fi
-            if [[ "$BUILDKITE_SOURCE" == 'schedule' ]]; then
+            if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
                 cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}

From b6e1c1d1ddd535bdbdd8eab9fb0e669d308e62dc Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 12:34:12 -0400
Subject: [PATCH 50/52] Fix mac queues being moved around.

---
 .cicd/generate-pipeline.sh | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 30704505915..a5738e74a55 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -135,8 +135,7 @@ EOF
           debug: true
           wait-network: true
     timeout: ${TIMEOUT:-180}
-    agents:
-      - "queue=mac-anka-large-node-fleet"
+    agents: "queue=mac-anka-large-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_BUILD}
 
 EOF
@@ -195,8 +194,7 @@ EOF
           debug: true
           wait-network: true
     timeout: ${TIMEOUT:-20}
-    agents:
-      - "queue=mac-anka-node-fleet"
+    agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 
 EOF
@@ -251,8 +249,7 @@ EOF
           debug: true
           wait-network: true
     timeout: ${TIMEOUT:-20}
-    agents:
-      - "queue=mac-anka-node-fleet"
+    agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 EOF
             fi
@@ -308,8 +305,7 @@ EOF
           debug: true
           wait-network: true
     timeout: ${TIMEOUT:-180}
-    agents:
-      - "queue=mac-anka-node-fleet"
+    agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 EOF
             fi

From edbfeab81b1a70ea9654c21bd6469f6faa71ec47 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 12:51:04 -0400
Subject: [PATCH 51/52] Support double-digit major versions.

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index a5738e74a55..fdc1ac76264 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -57,7 +57,7 @@ if [[ ! -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
 fi
 export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_BUILD_ID}
 # set trigger_job if master/release/develop branch and webhook
-if [[ $BUILDKITE_BRANCH =~ ^release/[0-9].[0-9]+.x$ || $BUILDKITE_BRANCH =~ ^master$ || $BUILDKITE_BRANCH =~ ^develop$ ]]; then
+if [[ $BUILDKITE_BRANCH =~ ^release/[0-9]+\.[0-9]+\.x$ || $BUILDKITE_BRANCH =~ ^master$ || $BUILDKITE_BRANCH =~ ^develop$ ]]; then
     [[ $BUILDKITE_SOURCE == 'webhook' ]] && export TRIGGER_JOB=true
 fi
 oIFS="$IFS"

From 02dd0095be9a5db0310b4ad8338e9c6145ecf8de Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 12:58:45 -0400
Subject: [PATCH 52/52] Added back pipeline tail comment.

---
 .cicd/generate-pipeline.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index fdc1ac76264..3e80f2f7ad2 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -366,6 +366,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB = "true" ]]; then
 EOF
     fi
 fi
+# pipeline tail
 cat <<EOF
   - wait:
     continue_on_failure: true