[draft] [chef] Upgrade CI workers for chef tests

signalfx · Jan 17, 2025 · 535a02f · 535a02f
1 parent 22d8607
commit 535a02f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/chef-test.yml b/.github/workflows/chef-test.yml
@@ -32,8 +32,7 @@ env:
 jobs:
   chef-lint-spec-test:
     name: chef-lint-spec-test
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
@@ -46,7 +45,7 @@ jobs:
           make rake-spec
 
   chef-kitchen-matrix:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out code
         uses: actions/checkout@v4
@@ -80,8 +79,7 @@ jobs:
       win-matrix: ${{ steps.get-win-matrix.outputs.matrix }}
 
   chef-kitchen-linux:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [chef-lint-spec-test, chef-kitchen-matrix]
     strategy:
       matrix: ${{ fromJSON(needs.chef-kitchen-matrix.outputs.linux-matrix) }}

diff --git a/.github/workflows/chef.yml b/.github/workflows/chef.yml
@@ -17,8 +17,7 @@ permissions:
 jobs:
   push-release-tag:
     name: Push Release Tag
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: github.ref == 'refs/heads/main'
     steps:
       - name: Checkout

diff --git a/deployments/chef/Dockerfile b/deployments/chef/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.7-buster
+FROM ruby:3.4-buster
 
 RUN apt-get update &&\
     apt-get install -yq ca-certificates procps systemd apt-transport-https libcap2-bin curl gnupg