From 30d6108d54ac22bdd5515d2cd851aa3c1e5ffcd0 Mon Sep 17 00:00:00 2001 From: Amaury Chamayou Date: Thu, 5 Dec 2024 18:08:56 +0000 Subject: [PATCH] Update base image to 05-12-2024 on main --- .azure-pipelines-release.yml | 6 +++--- .azure-pipelines-templates/deploy_aci.yml | 2 +- .azure_pipelines_snp.yml | 2 +- .github/workflows/bencher.yml | 2 +- .github/workflows/ci-verification.yml | 6 +++--- .github/workflows/ci.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/long-test.yml | 8 ++++---- .github/workflows/long-verification.yml | 4 ++-- .github/workflows/release.yml | 2 +- docker/ccf_ci_built | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.azure-pipelines-release.yml b/.azure-pipelines-release.yml index 62e7e332e648..7e7a9d2083dd 100644 --- a/.azure-pipelines-release.yml +++ b/.azure-pipelines-release.yml @@ -8,15 +8,15 @@ pr: none resources: containers: - container: virtual - image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro - container: snp - image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro - container: sgx - image: ghcr.io/microsoft/ccf/ci/sgx:build-08-10-2024 + image: ghcr.io/microsoft/ccf/ci/sgx:build-05-12-2024 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx -v /lib/modules:/lib/modules:ro variables: diff --git a/.azure-pipelines-templates/deploy_aci.yml b/.azure-pipelines-templates/deploy_aci.yml index 010d6977883f..ffb4a7f5d6e4 100644 --- a/.azure-pipelines-templates/deploy_aci.yml +++ b/.azure-pipelines-templates/deploy_aci.yml @@ -50,7 +50,7 @@ jobs: env: ACR_REGISTRY_RESOURCE_NAME: ccfmsrc ACR_REGISTRY: ccfmsrc.azurecr.io - BASE_IMAGE: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024 + BASE_IMAGE: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024 - script: | set -ex diff --git a/.azure_pipelines_snp.yml b/.azure_pipelines_snp.yml index 7a63804ea319..76aec28d7c6f 100644 --- a/.azure_pipelines_snp.yml +++ b/.azure_pipelines_snp.yml @@ -22,7 +22,7 @@ schedules: resources: containers: - container: virtual - image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro jobs: diff --git a/.github/workflows/bencher.yml b/.github/workflows/bencher.yml index 721a31c1338f..0360c49b8a4a 100644 --- a/.github/workflows/bencher.yml +++ b/.github/workflows/bencher.yml @@ -11,7 +11,7 @@ jobs: name: Continuous Benchmarking with Bencher runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] container: - image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024 steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/ci-verification.yml b/.github/workflows/ci-verification.yml index d08da14eb97b..1374ca471d3a 100644 --- a/.github/workflows/ci-verification.yml +++ b/.github/workflows/ci-verification.yml @@ -24,7 +24,7 @@ jobs: name: Model Checking - Consistency runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] container: - image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024 defaults: run: working-directory: tla @@ -102,7 +102,7 @@ jobs: name: Model Checking - Consensus runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] container: - image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024 defaults: run: working-directory: tla @@ -158,7 +158,7 @@ jobs: name: Trace Validation - Consensus runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] container: - image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d60bca9c0f9b..f33072174a35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: checks: name: "Format and License Checks" runs-on: ubuntu-latest - container: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024 + container: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024 steps: - run: git config --global --add safe.directory "$GITHUB_WORKSPACE" @@ -44,7 +44,7 @@ jobs: options: --user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro runs-on: ${{ matrix.platform.nodes }} container: - image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-08-10-2024 + image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-05-12-2024 options: ${{ matrix.platform.options }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2aa128bc6a98..18f5d89df7c3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -25,7 +25,7 @@ jobs: # Insufficient space to run on public runner, so use custom pool runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] container: - image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024 options: --user root permissions: diff --git a/.github/workflows/long-test.yml b/.github/workflows/long-test.yml index 1938814c7b72..91940977a3bc 100644 --- a/.github/workflows/long-test.yml +++ b/.github/workflows/long-test.yml @@ -17,7 +17,7 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-test') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }} runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] container: - image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024 steps: - uses: actions/checkout@v4 @@ -35,7 +35,7 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-test') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }} runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] container: - image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024 steps: - uses: actions/checkout@v4 @@ -79,7 +79,7 @@ jobs: name: TSAN runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] container: - image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024 steps: - uses: actions/checkout@v4 @@ -117,7 +117,7 @@ jobs: name: LTS runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] container: - image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/long-verification.yml b/.github/workflows/long-verification.yml index e2f3e7706ca0..a1f47406966a 100644 --- a/.github/workflows/long-verification.yml +++ b/.github/workflows/long-verification.yml @@ -22,7 +22,7 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-verification') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }} runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] container: - image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024 defaults: run: working-directory: tla @@ -50,7 +50,7 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-verification') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }} runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] container: - image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024 defaults: run: working-directory: tla diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9144a048c009..aab772ee1e7f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -75,7 +75,7 @@ jobs: nodes: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] runs-on: ${{ matrix.platform.nodes }} container: - image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-08-10-2024 + image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-05-12-2024 options: "--user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro ${{ matrix.platform.container_options }}" steps: - uses: actions/checkout@v4 diff --git a/docker/ccf_ci_built b/docker/ccf_ci_built index b2c1bca7c2fd..5bfb3d872175 100644 --- a/docker/ccf_ci_built +++ b/docker/ccf_ci_built @@ -3,7 +3,7 @@ # Also contains CCF source and build directory # Latest image as of this change -ARG base=ghcr.io/microsoft/ccf/ci/default:build-08-10-2024 +ARG base=ghcr.io/microsoft/ccf/ci/default:build-05-12-2024 FROM ${base} # SSH. Note that this could (should) be done in the base ccf_ci image instead