Use N2. Adjust jobs as needed.

Author: smgoller

ci/pipelines/shared/jinja.variables.yml

@@ -118,15 +118,15 @@ tests:
   name: acceptance
 - ARTIFACT_SLUG: distributedtestfiles
   CALL_STACK_TIMEOUT: '11700'
-  CPUS: '96'
+  CPUS: '80'
   DISK: '200GB'
   DUNIT_PARALLEL_FORKS: '24'
   EXECUTE_TEST_TIMEOUT: 4h
   GRADLE_TASK: distributedTest
   MAX_IN_FLIGHT: 2
   PARALLEL_DUNIT: 'true'
   PLATFORM: linux
-  RAM: '250'
+  RAM: '320'
   name: distributed
 - ARTIFACT_SLUG: integrationtestfiles
   CALL_STACK_TIMEOUT: '1500'
@@ -138,31 +138,31 @@ 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: '80'
   DISK: '200GB'
   DUNIT_PARALLEL_FORKS: '48'
   EXECUTE_TEST_TIMEOUT: 4h
   GRADLE_TASK: upgradeTest
   MAX_IN_FLIGHT: 2
   PARALLEL_DUNIT: 'true'
   PLATFORM: linux
-  RAM: '210'
+  RAM: '320'
   name: upgrade
 - ARTIFACT_SLUG: stressnewtestfiles
   CALL_STACK_TIMEOUT: '35100'
-  CPUS: '96'
+  CPUS: '80'
   DISK: '300GB'
   DUNIT_PARALLEL_FORKS: '24'
   EXECUTE_TEST_TIMEOUT: 10h
   GRADLE_TASK: repeatTest
   PARALLEL_DUNIT: 'true'
   PARALLEL_GRADLE: 'false'
   PLATFORM: linux
-  RAM: '280'
+  RAM: '320'
   name: stress-new
 - ARTIFACT_SLUG: windows-acceptancetestfiles
   CPUS: '6'

ci/scripts/create_instance.sh

@@ -133,7 +133,7 @@ RAM_MEGABYTES=$( expr ${RAM} \* 1024 )
 MACHINE_PREFIX="e2"
 
 if (( ${RAM} > 128 )) || (( ${CPUS} > 32 )); then
-  MACHINE_PREFIX="n1"
+  MACHINE_PREFIX="n2"
 fi
 
 if (( ${RAM} == ${CPUS} )); then