Merge pull request #1723 from ktock/ci-ubuntu-24.04

CI: Bump up to ubuntu 24.04
containerd · Oct 17, 2024 · 4ac9e3b · 4ac9e3b
2 parents 01fd667 + d5742ba
commit 4ac9e3b
Show file tree

Hide file tree

Showing 12 changed files with 127 additions and 102 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -10,7 +10,7 @@ env:
 
 jobs:
   hello-bench:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: HelloBench
     env:
       BENCHMARK_LOG_DIR: ${{ github.workspace }}/log/
@@ -29,8 +29,8 @@ jobs:
     steps:
     - name: Install tools
       run: |
-          sudo apt-get update && sudo apt-get --no-install-recommends install -y gnuplot
-          pip install numpy
+          sudo apt-get update && \
+          sudo apt-get install -y gnuplot python3-numpy
     - uses: actions/checkout@v4
     - name: Prepare directories
       run: mkdir "${BENCHMARK_RESULT_DIR}" "${BENCHMARK_LOG_DIR}"

diff --git a/.github/workflows/kind-image.yml b/.github/workflows/kind-image.yml
@@ -10,7 +10,7 @@ env:
 
 jobs:
   kind-image:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Kind image
     steps:
       - name: Checkout

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -22,7 +22,7 @@ env:
 
 jobs:
   integration:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Integration
     steps:
     - name: Install htpasswd for setting up private registry
@@ -32,7 +32,7 @@ jobs:
       run: make integration
 
   test-optimize:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Optimize
     steps:
     - name: Install htpasswd for setting up private registry
@@ -42,7 +42,7 @@ jobs:
       run: make test-optimize
 
   test-kind:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Kind
     steps:
     - name: Install htpasswd for setting up private registry
@@ -52,7 +52,7 @@ jobs:
       run: make test-kind
 
   test-criauth:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: CRIAuth
     steps:
     - name: Install htpasswd for setting up private registry
@@ -62,15 +62,15 @@ jobs:
       run: make test-criauth
 
   test-cri-containerd:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: CRIValidationContainerd
     steps:
     - uses: actions/checkout@v4
     - name: Varidate the runtime through CRI with containerd
       run: make test-cri-containerd
 
   test-cri-o:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: CRIValidationCRIO
     steps:
     - name: Install the latest docker
@@ -88,7 +88,7 @@ jobs:
         make test-cri-o
 
   test-k3s:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: K3S
     steps:
     - uses: actions/setup-go@v5

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Build
     strategy:
       matrix:
@@ -42,7 +42,7 @@ jobs:
         path: ${{ env.OUTPUT_DIR }}/*
 
   release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Release
     needs: [build]
     env:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -10,23 +10,23 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Build
     steps:
     - uses: actions/checkout@v4
     - name: Build all
       run: ./script/util/make.sh build -j2
 
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Test
     steps:
     - uses: actions/checkout@v4
     - name: Test all
       run: ./script/util/make.sh test-all -j2
 
   linter:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Linter
     strategy:
       fail-fast: false
@@ -47,7 +47,7 @@ jobs:
         working-directory: ${{ matrix.targetdir }}
 
   integration:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Integration
     strategy:
       fail-fast: false
@@ -76,7 +76,7 @@ jobs:
       run: make integration
 
   test-optimize:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Optimize
     strategy:
       fail-fast: false
@@ -94,7 +94,7 @@ jobs:
       run: make test-optimize
 
   test-kind:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Kind
     strategy:
       fail-fast: false
@@ -117,7 +117,7 @@ jobs:
       run: make test-kind
 
   test-criauth:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: CRIAuth
     strategy:
       fail-fast: false
@@ -140,7 +140,7 @@ jobs:
       run: make test-criauth
 
   test-cri-containerd:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: CRIValidationContainerd
     strategy:
       fail-fast: false
@@ -167,7 +167,7 @@ jobs:
       run: make test-cri-containerd
 
   test-cri-cri-o:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: CRIValidationCRIO
     strategy:
       fail-fast: false
@@ -190,15 +190,15 @@ jobs:
         make test-cri-o
 
   test-podman:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: PodmanRootless
     steps:
     - uses: actions/checkout@v4
     - name: Test Podman (rootless)
       run: make test-podman
 
   test-k3s:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: K3S
     steps:
     - uses: actions/setup-go@v5
@@ -218,15 +218,15 @@ jobs:
       run: make test-k3s
 
   test-ipfs:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: IPFS
     steps:
     - uses: actions/checkout@v4
     - name: Run test
       run: make test-ipfs
 
   test-k3s-argo-workflow:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: K3SArgoWorkflow
     env:
       RESULT_DIR: ${{ github.workspace }}/argo-workflow/
@@ -273,7 +273,7 @@ jobs:
 
   project:
     name: Project Checks
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 10
     steps:
       - uses: actions/setup-go@v5

diff --git a/Dockerfile b/Dockerfile
@@ -181,7 +181,7 @@ COPY --from=snapshotter-dev /out/ctr-remote /usr/local/bin/
 RUN ln -s /usr/local/bin/ctr-remote /usr/local/bin/ctr
 
 # Base image which contains podman with stargz-store
-FROM ubuntu:22.04 AS podman-base
+FROM ubuntu:24.04 AS podman-base
 ARG TARGETARCH
 ARG CNI_PLUGINS_VERSION
 ARG PODMAN_VERSION