Merge pull request #8392 from EOSIO/zach-1.8-resume-from-state

Add eosio-resume-from-state Test
EOSIO · Jan 3, 2020 · 9329491 · 9329491
2 parents ab2c027 + 23bdb0f
commit 9329491
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 9 deletions.
diff --git a/.cicd/docker-tag.sh b/.cicd/docker-tag.sh
@@ -18,5 +18,5 @@ docker push "$REPO:$PREFIX-$SANITIZED_BRANCH"
 [[ -z "$BUILDKITE_TAG" ]] || docker push "$REPO:$PREFIX-$SANITIZED_TAG"
 echo '+++ :put_litter_in_its_place: Cleaning Up'
 docker rmi "$REPO:$PREFIX-$SANITIZED_BRANCH"
-[[ -z "$BUILDKITE_TAG" ]] || docker rmi "$REPO:$PREFIX-$SANITIZED_TAG"
+[[ -z "$BUILDKITE_TAG" || "$SANITIZED_BRANCH" == "$SANITIZED_TAG" ]] || docker rmi "$REPO:$PREFIX-$SANITIZED_TAG"
 docker rmi "$IMAGE"
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
@@ -339,14 +339,14 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB == "true" ]]; then
     trigger: "eosio-lrt"
     async: true
     build:
-      message: "Triggered by EOSIO build ${BUILDKITE_BUILD_NUMBER}"
+      message: "Triggered by $BUILDKITE_PIPELINE_SLUG build $BUILDKITE_BUILD_NUMBER"
       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}"
-        BUILDKITE_TRIGGERED_FROM_BUILD_LINK: "${BUILDKITE_BUILD_URL}"
+        BUILDKITE_TRIGGERED_FROM_BUILD_URL: "${BUILDKITE_BUILD_URL}"
         SKIP_BUILD: "true"
         PINNED: "${PINNED}"
 
@@ -361,30 +361,49 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB = "true" ]]; then
     trigger: "eos-multiversion-tests"
     async: true
     build:
-      message: "Triggered by EOSIO build ${BUILDKITE_BUILD_NUMBER}"
+      message: "Triggered by $BUILDKITE_PIPELINE_SLUG build $BUILDKITE_BUILD_NUMBER"
       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}"
-        BUILDKITE_TRIGGERED_FROM_BUILD_LINK: "${BUILDKITE_BUILD_URL}"
+        BUILDKITE_TRIGGERED_FROM_BUILD_URL: "${BUILDKITE_BUILD_URL}"
 
 EOF
     fi
 fi
 # trigger eosio-sync-from-genesis for every build
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && -z "${SKIP_INSTALL}${SKIP_LINUX}${SKIP_DOCKER}" ]]; then
+if [[ "$BUILDKITE_PIPELINE_SLUG" == 'eosio' && -z "${SKIP_INSTALL}${SKIP_LINUX}${SKIP_DOCKER}${SKIP_SYNC_TESTS}" ]]; then
     cat <<EOF
-  - label: ":chains: Sync-from-Genesis Test"
+  - label: ":chains: Sync from Genesis Test"
     trigger: "eosio-sync-from-genesis"
     async: false
     build:
-      message: "Triggered by EOSIO build ${BUILDKITE_BUILD_NUMBER}"
+      message: "Triggered by $BUILDKITE_PIPELINE_SLUG build $BUILDKITE_BUILD_NUMBER"
       commit: "${BUILDKITE_COMMIT}"
       branch: "${BUILDKITE_BRANCH}"
       env:
-        BUILDKITE_TRIGGERED_FROM_BUILD_LINK: "${BUILDKITE_BUILD_URL}"
+        BUILDKITE_TRIGGERED_FROM_BUILD_URL: "${BUILDKITE_BUILD_URL}"
+        SKIP_JUNGLE: "${SKIP_JUNGLE}"
+        SKIP_KYLIN: "${SKIP_KYLIN}"
+        SKIP_MAIN: "${SKIP_MAIN}"
+        TIMEOUT: "${TIMEOUT}"
+
+EOF
+fi
+# trigger eosio-resume-from-state for every build
+if [[ "$BUILDKITE_PIPELINE_SLUG" == 'eosio' && -z "${SKIP_INSTALL}${SKIP_LINUX}${SKIP_DOCKER}${SKIP_SYNC_TESTS}" ]]; then
+    cat <<EOF
+  - label: ":outbox_tray: Resume from State Test"
+    trigger: "eosio-resume-from-state"
+    async: false
+    build:
+      message: "Triggered by $BUILDKITE_PIPELINE_SLUG build $BUILDKITE_BUILD_NUMBER"
+      commit: "${BUILDKITE_COMMIT}"
+      branch: "${BUILDKITE_BRANCH}"
+      env:
+        BUILDKITE_TRIGGERED_FROM_BUILD_URL: "${BUILDKITE_BUILD_URL}"
         SKIP_JUNGLE: "${SKIP_JUNGLE}"
         SKIP_KYLIN: "${SKIP_KYLIN}"
         SKIP_MAIN: "${SKIP_MAIN}"

diff --git a/pipeline.jsonc b/pipeline.jsonc
@@ -32,5 +32,17 @@
             "SKIP_PRE_V180": "true",
             "SKIP_V180": "false"
         }
+    },
+    "eosio-resume-from-state":
+    {
+        "test":
+        [
+            {
+                "tag": "v1.8.6"
+            },
+            {
+                "tag": "v1.8.7"
+            }
+        ]
     }
 }