[GEODE-10369] if scratch ssd is used, fall back to n1 machine type.

ci/pipelines/geode-build/jinja.template.yml

@@ -23,8 +23,6 @@
 
 {% macro plan_resource_gets(test) %}
 - get: geode-ci
-  passed:
-  - build
 - in_parallel:
   - get: geode
     trigger: true

ci/pipelines/shared/jinja.variables.yml

@@ -120,14 +120,15 @@ tests:
   CALL_STACK_TIMEOUT: '11700'
   CPUS: '96'
   DISK: '200GB'
-  DUNIT_PARALLEL_FORKS: '24'
+  DUNIT_PARALLEL_FORKS: '48'
   EXECUTE_TEST_TIMEOUT: 4h
   GRADLE_TASK: distributedTest
   MAX_IN_FLIGHT: 2
   PARALLEL_DUNIT: 'true'
   PLATFORM: linux
-  RAM: '250'
-  name: distributed
+  # For N1 machine types, we ask for 384GiB but get 360GiB due to GCP overhead.
+  RAM: '384'
+  name: distributed-standard-96-48jobs
 - ARTIFACT_SLUG: integrationtestfiles
   CALL_STACK_TIMEOUT: '1500'
   CPUS: '96'
@@ -138,31 +139,33 @@ tests:
   MAX_IN_FLIGHT: 1
   PARALLEL_DUNIT: 'true'
   PLATFORM: linux
-  RAM: '90'
+  RAM: '96'
   name: integration
 - ARTIFACT_SLUG: upgradetestfiles
   CALL_STACK_TIMEOUT: '13500'
-  CPUS: '96'
+  CPUS: '64'
   DISK: '200GB'
   DUNIT_PARALLEL_FORKS: '48'
   EXECUTE_TEST_TIMEOUT: 4h
   GRADLE_TASK: upgradeTest
   MAX_IN_FLIGHT: 2
   PARALLEL_DUNIT: 'true'
   PLATFORM: linux
-  RAM: '210'
+  # For N1 machine types, we ask for 256GiB but get 240GiB due to GCP overhead.
+  RAM: '256'
   name: upgrade
 - ARTIFACT_SLUG: stressnewtestfiles
   CALL_STACK_TIMEOUT: '35100'
-  CPUS: '96'
+  CPUS: '64'
   DISK: '300GB'
   DUNIT_PARALLEL_FORKS: '24'
   EXECUTE_TEST_TIMEOUT: 10h
   GRADLE_TASK: repeatTest
   PARALLEL_DUNIT: 'true'
   PARALLEL_GRADLE: 'false'
   PLATFORM: linux
-  RAM: '280'
+  # For N1 machine types, we ask for 256GiB but get 240GiB due to GCP overhead.
+  RAM: '256'
   name: stress-new
 - ARTIFACT_SLUG: windows-acceptancetestfiles
   CPUS: '6'

ci/scripts/delete_instance.sh

@@ -77,16 +77,24 @@ case "${MACHINE_TYPE}" in
     RAM_COST="$(echo "${INSTANCE_PRICING_JSON}" | jq -r ".\"${MACHINE_FAMILY}\".custom.ram")"
     ;;
   *-standard*)
-    CPUS="$(echo "${MACHINE_TYPE}" | rev | cut -d'-' -f 1 | rev)"
-    RAM=$(expr ${CPUS} \* 4 )
     MACHINE_FAMILY="$(echo "${MACHINE_TYPE}" | cut -d'-' -f 1)"
+    CPUS="$(echo "${MACHINE_TYPE}" | rev | cut -d'-' -f 1 | rev)"
+    if [[ "${MACHINE_FAMILY}" == "n1" ]]; then
+      RAM=$(echo "scale=0; (${CPUS} * 3.75) / 1" | bc)
+    else
+      RAM=$(expr ${CPUS} \* 4)
+    fi
     CPU_COST="$(echo "${INSTANCE_PRICING_JSON}" | jq -r ".\"${MACHINE_FAMILY}\".predefined.cpu")"
     RAM_COST="$(echo "${INSTANCE_PRICING_JSON}" | jq -r ".\"${MACHINE_FAMILY}\".predefined.ram")"
     ;;
   *-highcpu*)
-    CPUS="$(echo "${MACHINE_TYPE}" | rev | cut -d'-' -f 1 | rev)"
-    RAM=${CPUS}
     MACHINE_FAMILY="$(echo "${MACHINE_TYPE}" | cut -d'-' -f 1)"
+    CPUS="$(echo "${MACHINE_TYPE}" | rev | cut -d'-' -f 1 | rev)"
+    if [[ "${MACHINE_FAMILY}" == "n1" ]]; then
+      RAM=$(echo "scale=1; (${CPUS} * 0.9) / 1" | bc)
+    else
+      RAM=${CPUS}
+    fi
     CPU_COST="$(echo "${INSTANCE_PRICING_JSON}" | jq -r ".\"${MACHINE_FAMILY}\".predefined.cpu")"
     RAM_COST="$(echo "${INSTANCE_PRICING_JSON}" | jq -r ".\"${MACHINE_FAMILY}\".predefined.ram")"
     ;;
@@ -103,7 +111,7 @@ BUILD_NUMBER="$(cat instance-data/instance-information | jq -r '.[].labels."buil
 JOB_NAME="$(cat instance-data/instance-information | jq -r '.[].labels."job-name"')"
 PIPELINE_NAME="$(cat instance-data/instance-information | jq -r '.[].labels."pipeline-name"')"
 TOTAL_COST=$(echo "scale = 6; ((${CPUS} * ${CPU_COST}) + (${RAM} * ${RAM_COST})) * ${TOTAL_SECONDS} / 3600" | bc)
-echo "Total heavy lifter cost for ${PIPELINE_NAME}/${JOB_NAME} #${BUILD_NUMBER}: $ ${TOTAL_COST}"
+echo "Total heavy lifter (${MACHINE_TYPE}) cost for ${PIPELINE_NAME}/${JOB_NAME} #${BUILD_NUMBER}: $ ${TOTAL_COST}"
 cat <<EOF > instance-data/cost-data.json
 {
   "pipeline": "${PIPELINE_NAME}",