Use 80GB disk and bump Anka plugin to 0.6.1.

bifrost-io · Jun 12, 2020 · d86e328 · d86e328
1 parent 8241509
commit d86e328
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 23 deletions.
diff --git a/.cicd/base-images.yml b/.cicd/base-images.yml
@@ -28,9 +28,9 @@ steps:
       - "git clone [email protected]:EOSIO/eos.git eos && cd eos && git checkout -f $BUILDKITE_BRANCH"
       - "cd eos && ./.cicd/platforms/pinned/macos-10.14-pinned.sh"
     plugins:
-      - EOSIO/anka#v0.6.0:
+      - EOSIO/anka#v0.6.1:
           debug: true
-          vm-name: "10.14.6_6C_14G_40G"
+          vm-name: "10.14.6_6C_14G_80G"
           no-volume: true
           always-pull: true
           wait-network: true
@@ -93,9 +93,9 @@ steps:
       - "git clone [email protected]:EOSIO/eos.git eos && cd eos && git checkout -f $BUILDKITE_BRANCH"
       - "cd eos && ./.cicd/platforms/unpinned/macos-10.14-unpinned.sh"
     plugins:
-      - EOSIO/anka#v0.6.0:
+      - EOSIO/anka#v0.6.1:
           debug: true
-          vm-name: "10.14.6_6C_14G_40G"
+          vm-name: "10.14.6_6C_14G_80G"
           no-volume: true
           always-pull: true
           wait-network: true

diff --git a/.cicd/build-scripts.yml b/.cicd/build-scripts.yml
@@ -25,28 +25,27 @@ steps:
   - label: ":darwin: macOS 10.14 - Build Pinned"
     env:
       REPO: "[email protected]:EOSIO/eos.git"
-      TEMPLATE: "10.14.6_6C_14G_40G"
+      TEMPLATE: "10.14.6_6C_14G_80G"
       TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
     agents: "queue=mac-anka-large-node-fleet"
     command:
-      - "git clone [email protected]:EOSIO/eos.git eos && cd eos &&  git checkout -f $BUILDKITE_BRANCH && git submodule update --init --recursive"
+      - "git clone [email protected]:EOSIO/eos.git eos && cd eos && git checkout -f $BUILDKITE_BRANCH && git submodule update --init --recursive"
       - "cd eos && ./scripts/eosio_build.sh -P -y"
     plugins:
-      - EOSIO/anka#v0.5.7:
+      - EOSIO/anka#v0.6.1:
           debug: true
-          vm-name: "10.14.6_6C_14G_40G"
+          vm-name: "10.14.6_6C_14G_80G"
           no-volume: true
           modify-cpu: 12
           modify-ram: 24
           always-pull: true
           wait-network: true
           vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
-          pre-execute-sleep: 10
           failover-registries:
           - "registry_1"
           - "registry_2"
           inherit-environment-vars: true
-      - thedyrt/skip-checkout#v0.1.1:
+      - EOSIO/skip-checkout#v0.1.1:
           cd: ~
     timeout: 180
 
@@ -99,28 +98,27 @@ steps:
   - label: ":darwin: macOS 10.14 - Build UnPinned"
     env:
       REPO: "[email protected]:EOSIO/eos.git"
-      TEMPLATE: "10.14.6_6C_14G_40G"
+      TEMPLATE: "10.14.6_6C_14G_80G"
       TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
     agents: "queue=mac-anka-large-node-fleet"
     command:
       - "git clone [email protected]:EOSIO/eos.git eos && cd eos &&  git checkout -f $BUILDKITE_BRANCH && git submodule update --init --recursive"
       - "cd eos && ./scripts/eosio_build.sh -y"
     plugins:
-      - EOSIO/anka#v0.5.7:
+      - EOSIO/anka#v0.6.1:
           debug: true
-          vm-name: "10.14.6_6C_14G_40G"
+          vm-name: "10.14.6_6C_14G_80G"
           no-volume: true
           modify-cpu: 12
           modify-ram: 24
           always-pull: true
           wait-network: true
           vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
-          pre-execute-sleep: 10
           failover-registries:
           - "registry_1"
           - "registry_2"
           inherit-environment-vars: true
-      - thedyrt/skip-checkout#v0.1.1:
+      - EOSIO/skip-checkout#v0.1.1:
           cd: ~
     timeout: 180
 

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
@@ -3,7 +3,7 @@ set -eo pipefail
 # environment
 . ./.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.6_6C_14G_40G'}
+export MOJAVE_ANKA_TEMPLATE_NAME=${MOJAVE_ANKA_TEMPLATE_NAME:-'10.14.6_6C_14G_80G'}
 export PLATFORMS_JSON_ARRAY='[]'
 BUILDKITE_BUILD_AGENT_QUEUE='automation-eks-eos-builder-fleet'
 BUILDKITE_TEST_AGENT_QUEUE='automation-eks-eos-tester-fleet'
@@ -125,7 +125,7 @@ EOF
       - "cd eos && ./.cicd/build.sh"
       - "cd eos && tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
     plugins:
-      - EOSIO/anka#v0.6.0:
+      - EOSIO/anka#v0.6.1:
           no-volume: true
           inherit-environment-vars: true
           vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
@@ -216,7 +216,7 @@ EOF
       - "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:
-      - EOSIO/anka#v0.6.0:
+      - EOSIO/anka#v0.6.1:
           no-volume: true
           inherit-environment-vars: true
           vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
@@ -279,7 +279,7 @@ EOF
       - "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/wasm-spec-test.sh"
     plugins:
-      - EOSIO/anka#v0.6.0:
+      - EOSIO/anka#v0.6.1:
           no-volume: true
           inherit-environment-vars: true
           vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
@@ -345,7 +345,7 @@ EOF
       - "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:
-      - EOSIO/anka#v0.6.0:
+      - EOSIO/anka#v0.6.1:
           no-volume: true
           inherit-environment-vars: true
           vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
@@ -412,7 +412,7 @@ EOF
       - "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:
-      - EOSIO/anka#v0.6.0:
+      - EOSIO/anka#v0.6.1:
           no-volume: true
           inherit-environment-vars: true
           vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
@@ -596,10 +596,10 @@ cat <<EOF
       - "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:
-      - EOSIO/anka#v0.6.0:
+      - EOSIO/anka#v0.6.1:
           no-volume: true
           inherit-environment-vars: true
-          vm-name: 10.14.6_6C_14G_40G
+          vm-name: 10.14.6_6C_14G_80G
           vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
           always-pull: true
           debug: true