зеркало из https://github.com/microsoft/CCF.git
Update CI image from 11-08 to 14-08 (#5544)
This commit is contained in:
Родитель
d7edc91738
Коммит
61bed8538a
|
@ -11,7 +11,7 @@ jobs:
|
|||
variables:
|
||||
Codeql.SkipTaskAutoInjection: true
|
||||
skipComponentGovernanceDetection: true
|
||||
container: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-virtual-clang15
|
||||
container: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-virtual-clang15
|
||||
pool:
|
||||
vmImage: ubuntu-20.04
|
||||
|
||||
|
|
|
@ -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:11-08-2023-snp-clang15
|
||||
docker pull $ACR_REGISTRY/ccf/ci:14-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:11-08-2023-snp-clang15
|
||||
BASE_IMAGE: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-snp-clang15
|
||||
|
||||
- script: |
|
||||
set -ex
|
||||
|
|
|
@ -29,15 +29,15 @@ schedules:
|
|||
resources:
|
||||
containers:
|
||||
- container: virtual
|
||||
image: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-virtual-clang15
|
||||
image: ccfmsrc.azurecr.io/ccf/ci:14-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:11-08-2023-snp-clang15
|
||||
image: ccfmsrc.azurecr.io/ccf/ci:14-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:11-08-2023-sgx
|
||||
image: ccfmsrc.azurecr.io/ccf/ci:14-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:
|
||||
|
|
|
@ -34,7 +34,7 @@ variables:
|
|||
resources:
|
||||
containers:
|
||||
- container: virtual
|
||||
image: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-virtual-clang15
|
||||
image: ccfmsrc.azurecr.io/ccf/ci:14-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:
|
||||
|
|
|
@ -25,15 +25,15 @@ schedules:
|
|||
resources:
|
||||
containers:
|
||||
- container: virtual
|
||||
image: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-virtual-clang15
|
||||
image: ccfmsrc.azurecr.io/ccf/ci:14-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:11-08-2023-snp-clang15
|
||||
image: ccfmsrc.azurecr.io/ccf/ci:14-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:11-08-2023-sgx
|
||||
image: ccfmsrc.azurecr.io/ccf/ci:14-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:
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "CCF Development Environment",
|
||||
"image": "ccfmsrc.azurecr.io/ccf/ci:11-08-2023-virtual-clang15",
|
||||
"image": "ccfmsrc.azurecr.io/ccf/ci:14-08-2023-virtual-clang15",
|
||||
"runArgs": [],
|
||||
"extensions": [
|
||||
"eamodio.gitlens",
|
||||
|
|
|
@ -9,7 +9,7 @@ on:
|
|||
jobs:
|
||||
checks:
|
||||
runs-on: ubuntu-latest
|
||||
container: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-virtual-clang15
|
||||
container: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-virtual-clang15
|
||||
|
||||
steps:
|
||||
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
|
||||
|
|
|
@ -16,7 +16,7 @@ pr:
|
|||
resources:
|
||||
containers:
|
||||
- container: virtual
|
||||
image: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-virtual-clang15
|
||||
image: ccfmsrc.azurecr.io/ccf/ci:14-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:
|
||||
|
|
|
@ -20,7 +20,7 @@ schedules:
|
|||
resources:
|
||||
containers:
|
||||
- container: sgx
|
||||
image: ccfmsrc.azurecr.io/ccf/ci:11-08-2023-sgx
|
||||
image: ccfmsrc.azurecr.io/ccf/ci:14-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:
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
# Latest image as of this change
|
||||
ARG platform=sgx
|
||||
ARG base=ccfmsrc.azurecr.io/ccf/ci:11-08-2023-snp-clang-15
|
||||
ARG base=ccfmsrc.azurecr.io/ccf/ci:14-08-2023-snp-clang-15
|
||||
FROM ${base}
|
||||
|
||||
# SSH. Note that this could (should) be done in the base ccf_ci image instead
|
||||
|
|
|
@ -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:11-08-2023-snp",
|
||||
default="ccfmsrc.azurecr.io/ccf/ci:14-08-2023-snp",
|
||||
)
|
||||
parser.add_argument(
|
||||
"--aci-type",
|
||||
|
|
Загрузка…
Ссылка в новой задаче