Lower All Runner Sizes (#11539)

* Lower all runner sizes * Remove skips * Make Most of it Free * Return Solana and builds back to normal * Reset others
smartcontractkit · Dec 14, 2023 · 4b0608a · 4b0608a
1 parent 3c29970
commit 4b0608a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -207,8 +207,8 @@ jobs:
         id: build-test-matrix-list
         run: |
           cd ./integration-tests
-          MATRIX_JSON_AUTOMATION=$(./scripts/buildTestMatrixList.sh ./smoke/automation_test.go automation ubuntu20.04-8cores-32GB 1)
-          MATRIX_JSON_KEEPER=$(./scripts/buildTestMatrixList.sh ./smoke/keeper_test.go keeper ubuntu20.04-8cores-32GB 1)
+          MATRIX_JSON_AUTOMATION=$(./scripts/buildTestMatrixList.sh ./smoke/automation_test.go automation ubuntu-latest 1)
+          MATRIX_JSON_KEEPER=$(./scripts/buildTestMatrixList.sh ./smoke/keeper_test.go keeper ubuntu-latest 1)
           COMBINED_ARRAY=$(jq -c -n "$MATRIX_JSON_AUTOMATION + $MATRIX_JSON_KEEPER")
 
           # if we running a PR against the develop branch we should only run the automation tests unless we are in the merge group event
@@ -324,13 +324,13 @@ jobs:
             pyroscope_env: ""
           - name: ocr
             nodes: 1
-            os: ubuntu20.04-8cores-32GB
+            os: ubuntu-latest
             run: -run TestOCRJobReplacement
             file: ocr
             pyroscope_env: ci-smoke-ocr-evm-simulated
           - name: ocr-geth
             nodes: 1
-            os: ubuntu20.04-8cores-32GB
+            os: ubuntu-latest
             run: -run TestOCRBasic
             file: ocr
             client: geth
@@ -403,25 +403,25 @@ jobs:
             pyroscope_env: ""
           - name: vrf
             nodes: 1
-            os: ubuntu20.04-8cores-32GB
+            os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf-evm-simulated
           - name: vrfv2
             nodes: 1
             run: -run TestVRFv2MultipleSendingKeys
             file: vrfv2            
-            os: ubuntu20.04-8cores-32GB
+            os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf2-evm-simulated
           - name: vrfv2plus
             nodes: 1
-            os: ubuntu20.04-8cores-32GB
+            os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf2plus-evm-simulated                       
           - name: forwarder_ocr
             nodes: 1
-            os: ubuntu20.04-8cores-32GB
+            os: ubuntu-latest
             pyroscope_env: ci-smoke-forwarder-ocr-evm-simulated
           - name: forwarders_ocr2
             nodes: 1
-            os: ubuntu20.04-8cores-32GB
+            os: ubuntu-latest
             pyroscope_env: ci-smoke-forwarder-ocr-evm-simulated
     runs-on: ${{ matrix.product.os }}
     name: ETH Smoke Tests ${{ matrix.product.name }}${{ matrix.product.tag_suffix }}

diff --git a/integration-tests/smoke/automation_test.go_test_list.json b/integration-tests/smoke/automation_test.go_test_list.json
@@ -2,51 +2,51 @@
   "tests": [
     {
       "name": "TestAutomationBasic",
-      "label": "ubuntu20.04-32cores-128GB",
+      "label": "ubuntu-latest",
       "nodes": 6
     },
     {
       "name": "TestSetUpkeepTriggerConfig"
     },
     {
       "name": "TestAutomationAddFunds",
-      "label": "ubuntu20.04-32cores-128GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     },
     {
       "name": "TestAutomationPauseUnPause",
-      "label": "ubuntu20.04-16cores-64GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     },
     {
       "name": "TestAutomationRegisterUpkeep",
-      "label": "ubuntu20.04-16cores-64GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     },
     {
       "name": "TestAutomationPauseRegistry",
-      "label": "ubuntu20.04-16cores-64GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     },
     {
       "name": "TestAutomationKeeperNodesDown",
-      "label": "ubuntu20.04-16cores-64GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     },
     {
       "name": "TestAutomationPerformSimulation",
-      "label": "ubuntu20.04-16cores-64GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     },
     {
       "name": "TestAutomationCheckPerformGasLimit",
-      "label": "ubuntu20.04-32cores-128GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     },
     {
       "name": "TestUpdateCheckData",
-      "label": "ubuntu20.04-32cores-128GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     }
   ]
-}
+}
diff --git a/integration-tests/smoke/keeper_test.go_test_list.json b/integration-tests/smoke/keeper_test.go_test_list.json
@@ -2,50 +2,50 @@
   "tests": [
     {
       "name": "TestKeeperBasicSmoke",
-      "label": "ubuntu20.04-32cores-128GB",
+      "label": "ubuntu-latest",
       "nodes": 3
     },
     {
       "name": "TestKeeperBlockCountPerTurn",
-      "label": "ubuntu20.04-32cores-128GB",
+      "label": "ubuntu-latest",
       "nodes": 3
     },
     {
       "name": "TestKeeperSimulation",
-      "label": "ubuntu20.04-16cores-64GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     },
     {
       "name": "TestKeeperCheckPerformGasLimit",
-      "label": "ubuntu20.04-16cores-64GB",
+      "label": "ubuntu-latest",
       "nodes": 3
     },
     {
       "name": "TestKeeperRegisterUpkeep",
-      "label": "ubuntu20.04-16cores-64GB",
+      "label": "ubuntu-latest",
       "nodes": 3
     },
     {
       "name": "TestKeeperAddFunds",
-      "label": "ubuntu20.04-16cores-64GB",
+      "label": "ubuntu-latest",
       "nodes": 3
     },
     {
       "name": "TestKeeperRemove",
-      "label": "ubuntu20.04-32cores-128GB",
+      "label": "ubuntu-latest",
       "nodes": 3
     },
     {
       "name": "TestKeeperPauseRegistry",
-      "label": "ubuntu20.04-16cores-64GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     },
     {
       "name": "TestKeeperMigrateRegistry"
     },
     {
       "name": "TestKeeperNodeDown",
-      "label": "ubuntu20.04-32cores-128GB",
+      "label": "ubuntu-latest",
       "nodes": 3
     },
     {
@@ -58,4 +58,4 @@
       "name": "TestKeeperJobReplacement"
     }
   ]
-}
+}