Merge pull request EOSIO#7851 from EOSIO/cicd-fixes-r1.8

[1.8.x] Increase Contracts Builder Timeout + Fix $SKIP_MAC
boscore · Sep 5, 2019 · eb4b9ce · eb4b9ce
2 parents b359375 + b5d2954
commit eb4b9ce
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
@@ -338,11 +338,11 @@ cat <<EOF
   - label: ":ubuntu: Ubuntu 18.04 - Contract Builder"
     command: "./.cicd/installation-build.sh"
     env:
-      IMAGE_TAG: "ubuntu-18.04"
+      IMAGE_TAG: "ubuntu-18.04-unpinned"
       BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
       queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
+    timeout: ${TIMEOUT:-30}
     skip: ${SKIP_CONTRACT_BUILDER}${SKIP_LINUX}
 
   - wait
@@ -360,7 +360,7 @@ cat <<EOF
     agents:
       queue: "automation-basic-builder-fleet"
     timeout: "${TIMEOUT:-5}"
-    skip: ${SKIP_MOJAVE}${SKIP_PACKAGE_BUILDER}
+    skip: ${SKIP_MOJAVE}${SKIP_PACKAGE_BUILDER}${SKIP_MAC}
 
 EOF
 IFS=$oIFS