From afd37ec3fee39de07d5e7fca6b5d878a5be797e7 Mon Sep 17 00:00:00 2001 From: Amaury Chamayou Date: Mon, 7 Oct 2024 12:59:53 +0100 Subject: [PATCH] Upgrade CI image from 25-07-2024 to 07-10-2024 (#6528) --- .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 1c74d3326..da3992c99 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-25-07-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-07-10-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-25-07-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-07-10-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-25-07-2024 + image: ghcr.io/microsoft/ccf/ci/sgx:build-07-10-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 4795ceb87..1ab7d3a6b 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-25-07-2024 + BASE_IMAGE: ghcr.io/microsoft/ccf/ci/default:build-07-10-2024 - script: | set -ex diff --git a/.azure_pipelines_snp.yml b/.azure_pipelines_snp.yml index b46f4d0a5..303e29326 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-25-07-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-07-10-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 4c7b39e91..a16b59469 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-25-07-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-07-10-2024 steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/ci-verification.yml b/.github/workflows/ci-verification.yml index a6957c9b0..87b006d4a 100644 --- a/.github/workflows/ci-verification.yml +++ b/.github/workflows/ci-verification.yml @@ -23,7 +23,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-25-07-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-07-10-2024 defaults: run: working-directory: tla @@ -101,7 +101,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-25-07-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-07-10-2024 defaults: run: working-directory: tla @@ -157,7 +157,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-25-07-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-07-10-2024 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04599064e..1be9edf31 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-25-07-2024 + container: ghcr.io/microsoft/ccf/ci/default:build-07-10-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-25-07-2024 + image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-07-10-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 3f01a8b30..e5025f55d 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-25-07-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-07-10-2024 options: --user root permissions: diff --git a/.github/workflows/long-test.yml b/.github/workflows/long-test.yml index 4377a860f..bb6146cec 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') }} runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] container: - image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-07-10-2024 steps: - uses: actions/checkout@v4 @@ -35,7 +35,7 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-test') }} runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] container: - image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-07-10-2024 steps: - uses: actions/checkout@v4 @@ -78,7 +78,7 @@ jobs: name: TSAN runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] container: - image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-07-10-2024 steps: - uses: actions/checkout@v4 @@ -115,7 +115,7 @@ jobs: name: LTS runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] container: - image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-07-10-2024 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/long-verification.yml b/.github/workflows/long-verification.yml index 77b3f467c..36b81780e 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') }} runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] container: - image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-07-10-2024 defaults: run: working-directory: tla @@ -50,7 +50,7 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-verification') }} runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] container: - image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024 + image: ghcr.io/microsoft/ccf/ci/default:build-07-10-2024 defaults: run: working-directory: tla diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 359c73782..e290fc402 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-25-07-2024 + image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-07-10-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 c015342af..dea1125e8 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-25-07-2024 +ARG base=ghcr.io/microsoft/ccf/ci/default:build-07-10-2024 FROM ${base} # SSH. Note that this could (should) be done in the base ccf_ci image instead