diff --git a/.github/workflows/cd-deploy-nodes-gcp.yml b/.github/workflows/cd-deploy-nodes-gcp.yml index 1333816530f..01bad9142c0 100644 --- a/.github/workflows/cd-deploy-nodes-gcp.yml +++ b/.github/workflows/cd-deploy-nodes-gcp.yml @@ -276,7 +276,7 @@ jobs: - name: Create instance template for ${{ matrix.network }} run: | DISK_NAME="zebrad-cache-${{ env.GITHUB_HEAD_REF_SLUG_URL || env.GITHUB_REF_SLUG_URL }}-${{ env.GITHUB_SHA_SHORT }}-${NETWORK}" - DISK_PARAMS="name=${DISK_NAME},device-name=${DISK_NAME},size=400GB,type=pd-ssd" + DISK_PARAMS="name=${DISK_NAME},device-name=${DISK_NAME},size=400GB,type=pd-balanced" if [ -n "${{ env.CACHED_DISK_NAME }}" ]; then DISK_PARAMS+=",image=${{ env.CACHED_DISK_NAME }}" elif [ ${{ inputs.no_cached_disk && github.event_name == 'workflow_dispatch' }} ]; then @@ -287,8 +287,8 @@ jobs: fi gcloud compute instance-templates create-with-container zebrad-${{ needs.versioning.outputs.major_version || env.GITHUB_REF_SLUG_URL }}-${{ env.GITHUB_SHA_SHORT }}-${NETWORK} \ --machine-type ${{ vars.GCP_SMALL_MACHINE }} \ - --boot-disk-size 50GB \ - --boot-disk-type=pd-ssd \ + --boot-disk-size=10GB \ + --boot-disk-type=pd-standard \ --image-project=cos-cloud \ --image-family=cos-stable \ --network-interface=subnet=${{ vars.GCP_SUBNETWORK }} \ @@ -388,7 +388,7 @@ jobs: - name: Manual deploy of a single ${{ inputs.network }} instance running zebrad run: | DISK_NAME="zebrad-cache-${{ env.GITHUB_HEAD_REF_SLUG_URL || env.GITHUB_REF_SLUG_URL }}-${{ env.GITHUB_SHA_SHORT }}-${NETWORK}" - DISK_PARAMS="name=${DISK_NAME},device-name=${DISK_NAME},size=400GB,type=pd-ssd" + DISK_PARAMS="name=${DISK_NAME},device-name=${DISK_NAME},size=400GB,type=pd-balanced" if [ -n "${{ env.CACHED_DISK_NAME }}" ]; then DISK_PARAMS+=",image=${{ env.CACHED_DISK_NAME }}" elif [ ${{ inputs.no_cached_disk && github.event_name == 'workflow_dispatch' }} ]; then @@ -399,8 +399,8 @@ jobs: fi gcloud compute instances create-with-container "zebrad-${{ env.GITHUB_REF_SLUG_URL }}-${{ env.GITHUB_SHA_SHORT }}-${NETWORK}" \ --machine-type ${{ vars.GCP_SMALL_MACHINE }} \ - --boot-disk-size 50GB \ - --boot-disk-type=pd-ssd \ + --boot-disk-size=10GB \ + --boot-disk-type=pd-standard \ --image-project=cos-cloud \ --image-family=cos-stable \ --network-interface=subnet=${{ vars.GCP_SUBNETWORK }} \ diff --git a/.github/workflows/manual-zcashd-deploy.yml b/.github/workflows/manual-zcashd-deploy.yml index 05872f2532d..dfde89b3e86 100644 --- a/.github/workflows/manual-zcashd-deploy.yml +++ b/.github/workflows/manual-zcashd-deploy.yml @@ -64,8 +64,8 @@ jobs: - name: Create instance template run: | gcloud compute instance-templates create-with-container zcashd-${{ env.GITHUB_REF_SLUG_URL }}-${{ env.GITHUB_SHA_SHORT }} \ - --boot-disk-size 10GB \ - --boot-disk-type=pd-ssd \ + --boot-disk-size=10GB \ + --boot-disk-type=pd-standard \ --image-project=cos-cloud \ --image-family=cos-stable \ --container-stdin \ diff --git a/.github/workflows/sub-deploy-integration-tests-gcp.yml b/.github/workflows/sub-deploy-integration-tests-gcp.yml index 7266f60ea54..26c13e6044c 100644 --- a/.github/workflows/sub-deploy-integration-tests-gcp.yml +++ b/.github/workflows/sub-deploy-integration-tests-gcp.yml @@ -188,18 +188,18 @@ jobs: shell: /usr/bin/bash -x {0} run: | NAME="${{ inputs.test_id }}-${{ env.GITHUB_SHA_SHORT }}" - DISK_PARAMS="size=400GB,type=pd-ssd,name=${NAME},device-name=${NAME}" + DISK_PARAMS="size=400GB,type=pd-balanced,name=${NAME},device-name=${NAME}" if [ -n "${{ env.CACHED_DISK_NAME }}" ]; then DISK_PARAMS+=",image=${{ env.CACHED_DISK_NAME }}" fi gcloud compute instances create-with-container "${{ inputs.test_id }}-${{ env.GITHUB_REF_SLUG_URL }}-${{ env.GITHUB_SHA_SHORT }}" \ - --boot-disk-size 50GB \ - --boot-disk-type pd-ssd \ + --boot-disk-size=50GB \ + --boot-disk-type=pd-ssd \ --image-project=cos-cloud \ --image-family=cos-stable \ --create-disk="${DISK_PARAMS}" \ --container-image=gcr.io/google-containers/busybox \ - --machine-type ${{ vars.GCP_LARGE_MACHINE }} \ + --machine-type ${{ inputs.is_long_test && vars.GCP_LARGE_MACHINE || vars.GCP_SMALL_MACHINE }} \ --network-interface=subnet=${{ vars.GCP_SUBNETWORK }} \ --scopes cloud-platform \ --metadata=google-monitoring-enabled=TRUE,google-logging-enabled=TRUE \