update ubuntu from latest to pinned 22.04 (#525)

* uypdate ubuntu from latest to pinned 24.04 * update ubuntu from latest to pinned 24.04 also in scripts * update ubuntu from latest to pinned 22.04 also in scripts
DataDog · Jan 25, 2025 · baf72a1 · baf72a1
1 parent 3ef7b0c
commit baf72a1
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     permissions:
       actions: read
       contents: read

diff --git a/.github/workflows/redirect_issues.yml b/.github/workflows/redirect_issues.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   redirect-issues:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/release-serverless-init.yml b/.github/workflows/release-serverless-init.yml
@@ -34,7 +34,7 @@ env:
 
 jobs:
   release-serverless-init:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         arrays: [

diff --git a/.github/workflows/retry-workflow.yml b/.github/workflows/retry-workflow.yml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   rerun:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Rerun ${{ inputs.run_id }}
         env:

diff --git a/.github/workflows/rs_ci.yml b/.github/workflows/rs_ci.yml
@@ -166,7 +166,7 @@ jobs:
   # If this job fails, you probably need to regenerate the license, e.g.
   # CARGO_HOME=/tmp/dd-cargo cargo bundle-licenses --format yaml --output LICENSE-3rdparty.yml
   license-3rdparty:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     name: "Valid LICENSE-3rdparty.yml"
     steps:
       - name: Checkout sources

diff --git a/.github/workflows/serverless-vuln-scan.yml b/.github/workflows/serverless-vuln-scan.yml
@@ -14,7 +14,7 @@ env:
 
 jobs:
   check:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
 
       # scan latest released images
@@ -155,7 +155,7 @@ jobs:
   retry:
     needs: check
     if: failure() && fromJSON(github.run_attempt) < 2
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     permissions:
       actions: write
     steps:
@@ -168,7 +168,7 @@ jobs:
   notify:
     needs: check
     if: failure() && fromJSON(github.run_attempt) >= 2
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Notify
         env:

diff --git a/scripts/Dockerfile.alpine.build b/scripts/Dockerfile.alpine.build
@@ -45,7 +45,7 @@ RUN /usr/lib/go/bin/go tool nm datadog-agent | grep -w 'github.com/DataDog/datad
     (echo "agentVersionDefault variable doesn't exist" && exit 1)
 
 # zip the extension
-FROM ubuntu:24.04 as compresser
+FROM ubuntu:22.04 as compresser
 ARG CMD_PATH
 ARG DATADOG_WRAPPER=datadog_wrapper
 RUN apt-get update

diff --git a/scripts/Dockerfile.bottlecap.alpine.build b/scripts/Dockerfile.bottlecap.alpine.build
@@ -27,7 +27,7 @@ RUN --mount=type=cache,target=/root/.cargo/registry cargo +stable build --releas
 RUN cp /tmp/dd/bottlecap/target/$PLATFORM-unknown-linux-musl/release/bottlecap /tmp/dd/bottlecap/bottlecap
 
 # Zip Extension
-FROM ubuntu:24.04 as compresser
+FROM ubuntu:22.04 as compresser
 ARG DATADOG_WRAPPER=datadog_wrapper
 ARG GO_AGENT_PATH
 

diff --git a/scripts/Dockerfile.bottlecap.build b/scripts/Dockerfile.bottlecap.build
@@ -25,7 +25,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry cargo +stable build --re
 RUN cp /tmp/dd/bottlecap/target/$PLATFORM-unknown-linux-gnu/release/bottlecap /tmp/dd/bottlecap/bottlecap
 
 # Zip Extension
-FROM ubuntu:24.04 as compresser
+FROM ubuntu:22.04 as compresser
 ARG DATADOG_WRAPPER=datadog_wrapper
 ARG GO_AGENT_PATH
 

diff --git a/scripts/Dockerfile.bottlecap.dev b/scripts/Dockerfile.bottlecap.dev
@@ -20,7 +20,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry cargo +stable build --re
 RUN cp /tmp/dd/bottlecap/target/$PLATFORM-unknown-linux-gnu/release/bottlecap /tmp/dd/bottlecap/bottlecap
 
 # zip the extension
-FROM ubuntu:24.04 as compresser
+FROM ubuntu:22.04 as compresser
 ARG DATADOG_WRAPPER=datadog_wrapper
 
 RUN apt-get update

diff --git a/scripts/Dockerfile.build b/scripts/Dockerfile.build
@@ -47,7 +47,7 @@ RUN /usr/local/go/bin/go tool nm datadog-agent | grep -w 'github.com/DataDog/dat
     (echo "agentVersionDefault variable doesn't exist" && exit 1)
 
 # zip the extension
-FROM ubuntu:24.04 as compresser
+FROM ubuntu:22.04 as compresser
 ARG CMD_PATH
 ARG DATADOG_WRAPPER=datadog_wrapper
 

diff --git a/scripts/Dockerfile.race.build b/scripts/Dockerfile.race.build
@@ -36,7 +36,7 @@ RUN go tool nm datadog-agent | grep -w 'github.com/DataDog/datadog-agent/pkg/ver
     (echo "agentVersionDefault variable doesn't exist" && exit 1)
 
 # zip the extension
-FROM ubuntu:24.04 as compresser
+FROM ubuntu:22.04 as compresser
 RUN apt-get update
 RUN apt-get install -y zip
 RUN mkdir /extensions

diff --git a/scripts_v2/Dockerfile.build b/scripts_v2/Dockerfile.build
@@ -42,7 +42,7 @@ RUN /usr/local/go/bin/go tool nm datadog-agent | grep -w 'github.com/DataDog/dat
     (echo "agentVersionDefault variable doesn't exist" && exit 1)
 
 # zip the extension
-FROM ubuntu:24.04 as compresser
+FROM ubuntu:22.04 as compresser
 ARG CMD_PATH
 ARG DATADOG_WRAPPER=datadog_wrapper
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ on: @@
     jobs:
       rerun:
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-22.04
         steps:
           - name: Rerun ${{ inputs.run_id }}
             env:
@@ Expand Down @@