From dfb6b5efe52289ad548357929b95e0f6ed66a59a Mon Sep 17 00:00:00 2001 From: Amaury Chamayou Date: Fri, 11 Aug 2023 12:20:13 +0000 Subject: [PATCH] Update CI image to 11-08-2023 --- .azure-pipelines-gh-pages.yml | 2 +- .azure-pipelines-templates/deploy_aci.yml | 4 ++-- .azure-pipelines.yml | 6 +++--- .azure_pipelines_snp.yml | 2 +- .daily.yml | 6 +++--- .devcontainer/devcontainer.json | 2 +- .github/workflows/ci-checks.yml | 2 +- .multi-thread.yml | 2 +- .stress.yml | 2 +- docker/ccf_ci_built | 2 +- scripts/azure_deployment/arm_aci.py | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.azure-pipelines-gh-pages.yml b/.azure-pipelines-gh-pages.yml index 2e4b4571a89b..90f25ac62d38 100644 --- a/.azure-pipelines-gh-pages.yml +++ b/.azure-pipelines-gh-pages.yml @@ -11,7 +11,7 @@ jobs: variables: Codeql.SkipTaskAutoInjection: true skipComponentGovernanceDetection: true - container: ccfmsrc.azurecr.io/ccf/ci:10-08-2023-virtual-clang15 + container: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-virtual-clang15 pool: vmImage: ubuntu-20.04 diff --git a/.azure-pipelines-templates/deploy_aci.yml b/.azure-pipelines-templates/deploy_aci.yml index ed700f01982d..79fe480adf9f 100644 --- a/.azure-pipelines-templates/deploy_aci.yml +++ b/.azure-pipelines-templates/deploy_aci.yml @@ -50,7 +50,7 @@ jobs: - script: | set -ex docker login -u $ACR_TOKEN_NAME -p $ACR_CI_PUSH_TOKEN_PASSWORD $ACR_REGISTRY - docker pull $ACR_REGISTRY/ccf/ci:10-08-2023-snp-clang15 + docker pull $ACR_REGISTRY/ccf/ci:11-08-2023-snp-clang15 docker build -f docker/ccf_ci_built . --build-arg="base=$BASE_IMAGE" --build-arg="platform=snp" -t $ACR_REGISTRY/ccf/ci:pr-`git rev-parse HEAD` docker push $ACR_REGISTRY/ccf/ci:pr-`git rev-parse HEAD` name: build_ci_image @@ -59,7 +59,7 @@ jobs: ACR_TOKEN_NAME: ci-push-token ACR_CI_PUSH_TOKEN_PASSWORD: $(ACR_CI_PUSH_TOKEN_PASSWORD) ACR_REGISTRY: ccfmsrc.azurecr.io - BASE_IMAGE: ccfmsrc.azurecr.io/ccf/ci:10-08-2023-snp-clang15 + BASE_IMAGE: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-snp-clang15 - script: | set -ex diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 205c31ae43d9..35f731f07b65 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -29,15 +29,15 @@ schedules: resources: containers: - container: virtual - image: ccfmsrc.azurecr.io/ccf/ci:10-08-2023-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-virtual-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro - container: snp - image: ccfmsrc.azurecr.io/ccf/ci:10-08-2023-snp-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-snp-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro - container: sgx - image: ccfmsrc.azurecr.io/ccf/ci:10-08-2023-sgx + image: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-sgx 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_snp.yml b/.azure_pipelines_snp.yml index 932ddfcb2399..f1e54c0f42f4 100644 --- a/.azure_pipelines_snp.yml +++ b/.azure_pipelines_snp.yml @@ -34,7 +34,7 @@ variables: resources: containers: - container: virtual - image: ccfmsrc.azurecr.io/ccf/ci:10-08-2023-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-virtual-clang15 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/.daily.yml b/.daily.yml index 502f122d9f56..62cbe08bc411 100644 --- a/.daily.yml +++ b/.daily.yml @@ -25,15 +25,15 @@ schedules: resources: containers: - container: virtual - image: ccfmsrc.azurecr.io/ccf/ci:10-08-2023-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-virtual-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE - container: snp - image: ccfmsrc.azurecr.io/ccf/ci:10-08-2023-snp-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-snp-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro - container: sgx - image: ccfmsrc.azurecr.io/ccf/ci:10-08-2023-sgx + image: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-sgx 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 jobs: diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a30b22be026c..89569b73d055 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "CCF Development Environment", - "image": "ccfmsrc.azurecr.io/ccf/ci:10-08-2023-virtual-clang15", + "image": "ccfmsrc.azurecr.io/ccf/ci:11-08-2023-virtual-clang15", "runArgs": [], "extensions": [ "eamodio.gitlens", diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index af271eaf4aa2..80a173729b32 100644 --- a/.github/workflows/ci-checks.yml +++ b/.github/workflows/ci-checks.yml @@ -9,7 +9,7 @@ on: jobs: checks: runs-on: ubuntu-latest - container: ccfmsrc.azurecr.io/ccf/ci:10-08-2023-virtual-clang15 + container: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-virtual-clang15 steps: - run: git config --global --add safe.directory "$GITHUB_WORKSPACE" diff --git a/.multi-thread.yml b/.multi-thread.yml index 883f890fd85a..9e6491008f11 100644 --- a/.multi-thread.yml +++ b/.multi-thread.yml @@ -16,7 +16,7 @@ pr: resources: containers: - container: virtual - image: ccfmsrc.azurecr.io/ccf/ci:10-08-2023-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-virtual-clang15 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/.stress.yml b/.stress.yml index 6587f3ef99ed..2bbbda91c57b 100644 --- a/.stress.yml +++ b/.stress.yml @@ -20,7 +20,7 @@ schedules: resources: containers: - container: sgx - image: ccfmsrc.azurecr.io/ccf/ci:10-08-2023-sgx + image: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-sgx 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 jobs: diff --git a/docker/ccf_ci_built b/docker/ccf_ci_built index 7fe5cd9fbe19..7ad03b38e5b7 100644 --- a/docker/ccf_ci_built +++ b/docker/ccf_ci_built @@ -4,7 +4,7 @@ # Latest image as of this change ARG platform=sgx -ARG base=ccfmsrc.azurecr.io/ccf/ci:10-08-2023-snp-clang-15 +ARG base=ccfmsrc.azurecr.io/ccf/ci:11-08-2023-snp-clang-15 FROM ${base} # SSH. Note that this could (should) be done in the base ccf_ci image instead diff --git a/scripts/azure_deployment/arm_aci.py b/scripts/azure_deployment/arm_aci.py index 102342ddcade..9e405cb7f054 100644 --- a/scripts/azure_deployment/arm_aci.py +++ b/scripts/azure_deployment/arm_aci.py @@ -156,7 +156,7 @@ def parse_aci_args(parser: ArgumentParser) -> Namespace: "--aci-image", help="The name of the image to deploy in the ACI", type=str, - default="ccfmsrc.azurecr.io/ccf/ci:10-08-2023-snp", + default="ccfmsrc.azurecr.io/ccf/ci:11-08-2023-snp", ) parser.add_argument( "--aci-type",