From b1ce90c6523191b32495dcdc74d0d9dfc1680142 Mon Sep 17 00:00:00 2001 From: Amaury Chamayou Date: Wed, 16 Aug 2023 16:27:55 +0100 Subject: [PATCH] Remove graphviz from llvm task (#5551) --- .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 +- getting_started/setup_vm/roles/autoremove/install.yml | 6 ++++++ getting_started/setup_vm/roles/ccf_build/tasks/install.yml | 6 ------ getting_started/setup_vm/roles/ccf_build/vars/clang11.yml | 1 - getting_started/setup_vm/roles/ccf_build/vars/clang15.yml | 1 - scripts/azure_deployment/arm_aci.py | 2 +- 15 files changed, 22 insertions(+), 24 deletions(-) diff --git a/.azure-pipelines-gh-pages.yml b/.azure-pipelines-gh-pages.yml index 4088607a87c4..b55ce678f9c0 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:14-08-2023-virtual-clang15 + container: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-virtual-clang15 pool: vmImage: ubuntu-20.04 diff --git a/.azure-pipelines-templates/deploy_aci.yml b/.azure-pipelines-templates/deploy_aci.yml index c21d4a1e6482..145a553ab519 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:14-08-2023-snp-clang15 + docker pull $ACR_REGISTRY/ccf/ci:16-08-2023-1-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:14-08-2023-snp-clang15 + BASE_IMAGE: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-snp-clang15 - script: | set -ex diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index a179de102eca..dd513dbdfdb9 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -29,15 +29,15 @@ schedules: resources: containers: - container: virtual - image: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-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:14-08-2023-snp-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-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:14-08-2023-sgx + image: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-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 db816971c54a..565b4be889bb 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:14-08-2023-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-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 a3e7f947a394..3285a50d47ea 100644 --- a/.daily.yml +++ b/.daily.yml @@ -25,15 +25,15 @@ schedules: resources: containers: - container: virtual - image: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-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:14-08-2023-snp-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-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:14-08-2023-sgx + image: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-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 fde1384e4435..6029e2d85ef8 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "CCF Development Environment", - "image": "ccfmsrc.azurecr.io/ccf/ci:14-08-2023-virtual-clang15", + "image": "ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-virtual-clang15", "runArgs": [], "extensions": [ "eamodio.gitlens", diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index 669151e642a3..cd3477df0035 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:14-08-2023-virtual-clang15 + container: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-virtual-clang15 steps: - run: git config --global --add safe.directory "$GITHUB_WORKSPACE" diff --git a/.multi-thread.yml b/.multi-thread.yml index 466e5bb9c55d..7e90377ee79d 100644 --- a/.multi-thread.yml +++ b/.multi-thread.yml @@ -16,7 +16,7 @@ pr: resources: containers: - container: virtual - image: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-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 780d707d0069..a0bdfce012b2 100644 --- a/.stress.yml +++ b/.stress.yml @@ -20,7 +20,7 @@ schedules: resources: containers: - container: sgx - image: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-sgx + image: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-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 29585ae4e5a2..65a7d24d6ea5 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:14-08-2023-snp-clang-15 +ARG base=ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-snp-clang-15 FROM ${base} # SSH. Note that this could (should) be done in the base ccf_ci image instead diff --git a/getting_started/setup_vm/roles/autoremove/install.yml b/getting_started/setup_vm/roles/autoremove/install.yml index 14ac8a86d82d..c439ff434dc1 100644 --- a/getting_started/setup_vm/roles/autoremove/install.yml +++ b/getting_started/setup_vm/roles/autoremove/install.yml @@ -1,3 +1,9 @@ +- name: Remove graphviz debian package + apt: + name: graphviz + state: absent + become: yes + - name: Remove any uncessary packages apt: name: "autoremove" diff --git a/getting_started/setup_vm/roles/ccf_build/tasks/install.yml b/getting_started/setup_vm/roles/ccf_build/tasks/install.yml index 4a2405d5bed8..9ebcd7ec16f9 100644 --- a/getting_started/setup_vm/roles/ccf_build/tasks/install.yml +++ b/getting_started/setup_vm/roles/ccf_build/tasks/install.yml @@ -40,12 +40,6 @@ state: absent become: yes -- name: Remove graphviz debian package - apt: - name: graphviz - state: absent - become: yes - - name: Download doxygen get_url: url: "{{ doxygen_url }}" diff --git a/getting_started/setup_vm/roles/ccf_build/vars/clang11.yml b/getting_started/setup_vm/roles/ccf_build/vars/clang11.yml index 5b06f7487409..e5d60766fb1f 100644 --- a/getting_started/setup_vm/roles/ccf_build/vars/clang11.yml +++ b/getting_started/setup_vm/roles/ccf_build/vars/clang11.yml @@ -25,7 +25,6 @@ debs: - curl # client test infra - shellcheck # bash lint - iptables # partition test infra - - graphviz # required to run doxygen - unzip # required to unzip protoc install # Not installed on GitHub Actions environment because of conflicting package diff --git a/getting_started/setup_vm/roles/ccf_build/vars/clang15.yml b/getting_started/setup_vm/roles/ccf_build/vars/clang15.yml index 50d5b2816a7f..0f21efb0a20c 100644 --- a/getting_started/setup_vm/roles/ccf_build/vars/clang15.yml +++ b/getting_started/setup_vm/roles/ccf_build/vars/clang15.yml @@ -25,7 +25,6 @@ debs: - curl # client test infra - shellcheck # bash lint - iptables # partition test infra - - graphviz # required to run doxygen - unzip # required to unzip protoc install # Not installed on GitHub Actions environment because of conflicting package diff --git a/scripts/azure_deployment/arm_aci.py b/scripts/azure_deployment/arm_aci.py index 6caf1997e287..cf9e3d029b88 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:14-08-2023-snp", + default="ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-snp", ) parser.add_argument( "--aci-type",