From fc7da2561380e222a103b7e77ea44c8fca9d981c Mon Sep 17 00:00:00 2001 From: apostasie Date: Tue, 23 Jul 2024 16:45:09 -0700 Subject: [PATCH] Pin ubuntu versions, move to 22.04 and bookworm Signed-off-by: apostasie --- .github/workflows/ci.yml | 10 +++++----- .github/workflows/e2e.yml | 2 +- .github/workflows/k8s-e2e.yml | 2 +- .github/workflows/optimizer.yml | 2 +- .github/workflows/release.yml | 8 ++++---- integration/Dockerfile | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ea1e0094f..736c55cd6c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: build: name: Build and Lint timeout-minutes: 10 - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Check out code uses: actions/checkout@v4 @@ -34,7 +34,7 @@ jobs: build-optimizer: name: Build optimizer timeout-minutes: 10 - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Check out code uses: actions/checkout@v4 @@ -50,7 +50,7 @@ jobs: smoke: name: Smoke timeout-minutes: 10 - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Check out code uses: actions/checkout@v4 @@ -75,7 +75,7 @@ jobs: cross-build-test: name: Cross Build Test timeout-minutes: 10 - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: GOOS: ["linux", "windows", "darwin"] @@ -95,7 +95,7 @@ jobs: coverage: name: Code coverage timeout-minutes: 10 - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [build] steps: - name: Checkout code diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 5e3111fb63..74747c8294 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -20,7 +20,7 @@ env: jobs: run-e2e-for-cgroups-v1: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/k8s-e2e.yml b/.github/workflows/k8s-e2e.yml index c919ae39c3..9296ec7ddc 100644 --- a/.github/workflows/k8s-e2e.yml +++ b/.github/workflows/k8s-e2e.yml @@ -13,7 +13,7 @@ env: jobs: e2e_tests_k8s: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 timeout-minutes: 30 steps: - name: Checkout code diff --git a/.github/workflows/optimizer.yml b/.github/workflows/optimizer.yml index 5a20e9f838..67b7ec0511 100644 --- a/.github/workflows/optimizer.yml +++ b/.github/workflows/optimizer.yml @@ -19,7 +19,7 @@ env: jobs: run_optimizer: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4970d77b9c..4e329d116c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ env: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: include: @@ -79,7 +79,7 @@ jobs: path: | package/*.tar.gz* upload: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [build] steps: - uses: actions/checkout@v4 @@ -96,7 +96,7 @@ jobs: builds/release-tars-**/* publish-image: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [build] strategy: matrix: @@ -158,7 +158,7 @@ jobs: build-args: NYDUS_VER=${{ env.NYDUS_STABLE_VER }} publish-manifest: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [publish-image] steps: - name: Log in to the container registry diff --git a/integration/Dockerfile b/integration/Dockerfile index e8451e08e8..b1860e4a69 100644 --- a/integration/Dockerfile +++ b/integration/Dockerfile @@ -7,7 +7,7 @@ ARG DOWNLOADS_MIRROR="https://github.com" ARG NYDUS_VER=2.2.4 ARG NERDCTL_VER=1.0.0 -FROM golang:1.21.12-bullseye AS golang-base +FROM golang:1.21.12-bookworm AS golang-base ARG CONTAINERD_VER ARG CONTAINERD_PROJECT