chore(ci): Use free OSS 4 vCPU runners (#19683)

* chore(ci): Use free OSS 4 vCPU runners https://github.blog/2024-01-17-github-hosted-runners-double-the-power-for-open-source/ announced larger default runners for OSS projects. This should avoid our need to use the paid 4 vCPU runners (previously they were 2 vCPU). Signed-off-by: Jesse Szwedko <[email protected]> * Remove `linux` label Signed-off-by: Jesse Szwedko <[email protected]> * put latest back to 20.04 * docker prune after each test Signed-off-by: Jesse Szwedko <[email protected]> --------- Signed-off-by: Jesse Szwedko <[email protected]>
vectordotdev · Jan 25, 2024 · 10d237e · 10d237e
1 parent 857d049
commit 10d237e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 14 deletions.
diff --git a/.github/workflows/integration-comment.yml b/.github/workflows/integration-comment.yml
@@ -81,7 +81,7 @@ jobs:
 
   integration-tests:
     needs: prep-pr
-    runs-on: [linux, ubuntu-20.04-4core]
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -30,7 +30,7 @@ env:
 
 jobs:
   test-integration:
-    runs-on: [linux, ubuntu-20.04-4core]
+    runs-on: ubuntu-20.04
     timeout-minutes: 40
     if: inputs.if || github.event_name == 'workflow_dispatch'
     steps:

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -48,7 +48,7 @@ jobs:
 
   integration-tests:
     name: Integration Tests
-    runs-on: [linux, ubuntu-20.04-4core]
+    runs-on: ubuntu-20.04
     needs: changes
     if: always() && (
       github.event_name == 'merge_group' || (
@@ -97,8 +97,6 @@ jobs:
 
       - run: sudo npm -g install @datadog/datadog-ci
 
-      - run: docker image prune -af ; docker container prune -f
-
       - name: Determine if secrets are defined (PR author is team member).
         if: github.event_name == 'pull_request'
         env:
@@ -213,8 +211,6 @@ jobs:
           max_attempts: 3
           command: bash scripts/ci-integration-test.sh  dnstap
 
-      - run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
-
       - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.docker-logs == 'true' }}
         name: docker-logs
         uses: nick-fields/retry@v2
@@ -319,8 +315,6 @@ jobs:
           max_attempts: 3
           command: bash scripts/ci-integration-test.sh  mongodb
 
-      - run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
-
       - if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.nats == 'true' }}
         name: nats
         uses: nick-fields/retry@v2

diff --git a/.github/workflows/k8s_e2e.yml b/.github/workflows/k8s_e2e.yml
@@ -59,7 +59,7 @@ jobs:
 
   build-x86_64-unknown-linux-gnu:
     name: Build - x86_64-unknown-linux-gnu
-    runs-on: [linux, ubuntu-20.04-4core]
+    runs-on: ubuntu-20.04
     needs: changes
     # Run this job even if `changes` job is skipped (non- pull request trigger)
     if: ${{ !failure() && !cancelled() && (github.event_name != 'pull_request' || needs.changes.outputs.k8s == 'true') }}
@@ -179,7 +179,7 @@ jobs:
 
   test-e2e-kubernetes:
     name: K8s ${{ matrix.kubernetes_version.version }} / ${{ matrix.container_runtime }} (${{ matrix.kubernetes_version.role }})
-    runs-on: [linux, ubuntu-20.04-4core]
+    runs-on: ubuntu-20.04
     needs:
       - build-x86_64-unknown-linux-gnu
       - compute-k8s-test-plan

diff --git a/.github/workflows/misc.yml b/.github/workflows/misc.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   test-misc:
-    runs-on: [linux, ubuntu-20.04-4core]
+    runs-on: ubuntu-20.04
     env:
       CARGO_INCREMENTAL: 0
     steps:

diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
@@ -285,7 +285,7 @@ jobs:
 
   build-baseline:
     name: Build baseline Vector container
-    runs-on: [linux, ubuntu-20.04-4core]
+    runs-on: ubuntu-20.04
     needs:
       - compute-metadata
     steps:
@@ -322,7 +322,7 @@ jobs:
 
   build-comparison:
     name: Build comparison Vector container
-    runs-on: [linux, ubuntu-20.04-4core]
+    runs-on: ubuntu-20.04
     needs:
       - compute-metadata
     steps:

diff --git a/scripts/ci-integration-test.sh b/scripts/ci-integration-test.sh
@@ -27,4 +27,6 @@ cargo vdev -v int test --retries 2 -a "${INTEGRATION}"
 RET=$?
 cargo vdev -v int stop -a "${INTEGRATION}"
 ./scripts/upload-test-results.sh
+# clean up disk space
+docker image prune -af ; docker container prune -f
 exit $RET