From 1f6aae0590c7697fbcdc4074ea6b0f970e788235 Mon Sep 17 00:00:00 2001
From: neuronull <neuronull@pm.me>
Date: Wed, 28 Jun 2023 10:04:42 -0600
Subject: [PATCH 1/2] reduce all but int, int comment

---
 .github/workflows/cli.yml              | 2 +-
 .github/workflows/cross.yml            | 2 +-
 .github/workflows/integration-test.yml | 4 ++--
 .github/workflows/k8s_e2e.yml          | 6 +++---
 .github/workflows/misc.yml             | 2 +-
 .github/workflows/msrv.yml             | 2 +-
 .github/workflows/regression.yml       | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index a2ba175e0e4cd..9d22fda8527bb 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   test-cli:
-    runs-on: [linux, ubuntu-20.04-8core]
+    runs-on: ubuntu-latest
     env:
       CARGO_INCREMENTAL: 0
     steps:
diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml
index a3afadb8bddac..19b53a9fae27f 100644
--- a/.github/workflows/cross.yml
+++ b/.github/workflows/cross.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   cross-linux:
     name: Cross - ${{ matrix.target }}
-    runs-on: [linux, ubuntu-20.04-8core]
+    runs-on: ubuntu-latest
     env:
       CARGO_INCREMENTAL: 0
     strategy:
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index a5f02316cdaa4..ffb741158c87e 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -40,8 +40,8 @@ env:
 
 jobs:
   test-integration:
-    runs-on: [linux, ubuntu-20.04-8core]
-    timeout-minutes: 30
+    runs-on: [linux, ubuntu-20.04-4core]
+    timeout-minutes: 40
     if: inputs.if || github.event_name == 'workflow_dispatch'
     steps:
       - name: (PR comment) Get PR branch
diff --git a/.github/workflows/k8s_e2e.yml b/.github/workflows/k8s_e2e.yml
index f9360132d71e0..50de3f5db9a2c 100644
--- a/.github/workflows/k8s_e2e.yml
+++ b/.github/workflows/k8s_e2e.yml
@@ -53,7 +53,7 @@ jobs:
 
   build-x86_64-unknown-linux-gnu:
     name: Build - x86_64-unknown-linux-gnu
-    runs-on: [linux, ubuntu-20.04-8core]
+    runs-on: [linux, ubuntu-20.04-4core]
     needs: changes
     if: github.event_name != 'pull_request' || needs.changes.outputs.k8s == 'true'
     # cargo-deb requires a release build, but we don't need optimizations for tests
@@ -126,7 +126,7 @@ jobs:
   # See https://github.community/t/feature-request-and-use-case-example-to-allow-matrix-in-if-s/126067
   compute-k8s-test-plan:
     name: Compute K8s test plan
-    runs-on: [linux, ubuntu-20.04-8core]
+    runs-on: ubuntu-latest
     needs: changes
     if: github.event_name != 'pull_request' || needs.changes.outputs.k8s == 'true'
     outputs:
@@ -187,7 +187,7 @@ jobs:
 
   test-e2e-kubernetes:
     name: K8s ${{ matrix.kubernetes_version.version }} / ${{ matrix.container_runtime }} (${{ matrix.kubernetes_version.role }})
-    runs-on: [linux, ubuntu-20.04-8core]
+    runs-on: [linux, ubuntu-20.04-4core]
     needs:
       - build-x86_64-unknown-linux-gnu
       - compute-k8s-test-plan
diff --git a/.github/workflows/misc.yml b/.github/workflows/misc.yml
index b106c65ee2655..035bbbc92a66e 100644
--- a/.github/workflows/misc.yml
+++ b/.github/workflows/misc.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   test-misc:
-    runs-on: [linux, ubuntu-20.04-8core]
+    runs-on: [linux, ubuntu-20.04-4core]
     env:
       CARGO_INCREMENTAL: 0
     steps:
diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml
index 361aa9cd4a3b8..9a82d1ddecbd0 100644
--- a/.github/workflows/msrv.yml
+++ b/.github/workflows/msrv.yml
@@ -13,7 +13,7 @@ env:
 
 jobs:
   check-msrv:
-    runs-on: [ubuntu-20.04]
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
index 40600010998c2..10978427460b6 100644
--- a/.github/workflows/regression.yml
+++ b/.github/workflows/regression.yml
@@ -280,7 +280,7 @@ jobs:
 
   build-baseline:
     name: Build baseline Vector container
-    runs-on: [linux, ubuntu-20.04-8core]
+    runs-on: [linux, ubuntu-20.04-4core]
     needs:
       - compute-metadata
     steps:
@@ -318,7 +318,7 @@ jobs:
 
   build-comparison:
     name: Build comparison Vector container
-    runs-on: [linux, soak-builder]
+    runs-on: [linux, ubuntu-20.04core]
     needs:
       - compute-metadata
     steps:

From 829eb34a7c813e91ad26dc0044a077be6d033463 Mon Sep 17 00:00:00 2001
From: neuronull <neuronull@pm.me>
Date: Wed, 28 Jun 2023 10:49:35 -0600
Subject: [PATCH 2/2] Update .github/workflows/regression.yml

Co-authored-by: Spencer Gilbert <spencer.gilbert@datadoghq.com>
---
 .github/workflows/regression.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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