Skip to content

Commit cb9229e

Browse files
achamayouachamayou
authored
Update to use latest CI image containing Open Enclave 0.19.6 (#6263)
1 parent 8000676 commit cb9229e

18 files changed

+25
-24
lines changed

‎.azure-pipelines-gh-pages.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
variables:
1212
Codeql.SkipTaskAutoInjection: true
1313
skipComponentGovernanceDetection: true
14-
container: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
14+
container: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15
1515
pool:
1616
vmImage: ubuntu-20.04
1717

‎.azure-pipelines-model-checking.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ schedules:
2121
resources:
2222
containers:
2323
- container: virtual
24-
image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
24+
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15
2525
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE
2626

2727
jobs:

‎.azure-pipelines-release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ pr: none
88
resources:
99
containers:
1010
- container: virtual
11-
image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
11+
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15
1212
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
1313

1414
- container: snp
15-
image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp-clang15
15+
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-snp-clang15
1616
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
1717

1818
- container: sgx
19-
image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-sgx
19+
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-sgx
2020
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
2121

2222
variables:

‎.azure-pipelines-templates/deploy_aci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- script: |
5555
set -ex
5656
docker login -u $ACR_TOKEN_NAME -p $ACR_CI_PUSH_TOKEN_PASSWORD $ACR_REGISTRY
57-
docker pull $ACR_REGISTRY/ccf/ci:2024-05-29-snp-clang15
57+
docker pull $ACR_REGISTRY/ccf/ci:oe-0.19.6-0-snp-clang15
5858
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`
5959
docker push $ACR_REGISTRY/ccf/ci:pr-`git rev-parse HEAD`
6060
name: build_ci_image
@@ -63,7 +63,7 @@ jobs:
6363
ACR_TOKEN_NAME: ci-push-token
6464
ACR_CI_PUSH_TOKEN_PASSWORD: $(ACR_CI_PUSH_TOKEN_PASSWORD)
6565
ACR_REGISTRY: ccfmsrc.azurecr.io
66-
BASE_IMAGE: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp-clang15
66+
BASE_IMAGE: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-snp-clang15
6767
6868
- script: |
6969
set -ex

‎.azure-pipelines.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ schedules:
3030
resources:
3131
containers:
3232
- container: virtual
33-
image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
33+
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15
3434
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
3535

3636
- container: snp
37-
image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp-clang15
37+
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-snp-clang15
3838
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
3939

4040
- container: sgx
41-
image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-sgx
41+
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-sgx
4242
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
4343

4444
variables:

‎.azure_pipelines_snp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ schedules:
3232
resources:
3333
containers:
3434
- container: virtual
35-
image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
35+
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15
3636
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
3737

3838
jobs:

‎.daily.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ schedules:
2727
resources:
2828
containers:
2929
- container: virtual
30-
image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
30+
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15
3131
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE
3232

3333
- container: snp
34-
image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp-clang15
34+
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-snp-clang15
3535
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
3636

3737
- container: sgx
38-
image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-sgx
38+
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-sgx
3939
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
4040

4141
jobs:

‎.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "CCF Development Environment",
3-
"image": "ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15",
3+
"image": "ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15",
44
"runArgs": [],
55
"extensions": [
66
"eamodio.gitlens",

‎.github/workflows/bencher.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Continuous Benchmarking with Bencher
1212
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
1313
container:
14-
image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
14+
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15
1515
steps:
1616
- uses: actions/checkout@v4
1717
with:

‎.github/workflows/ci-checks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions: read-all
1212
jobs:
1313
checks:
1414
runs-on: ubuntu-latest
15-
container: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
15+
container: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15
1616

1717
steps:
1818
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

‎.github/workflows/tlaplus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
name: Model Checking - Consistency
2020
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
2121
container:
22-
image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
22+
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15
2323

2424
steps:
2525
- uses: actions/checkout@v4

‎.multi-thread.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pr:
2020
resources:
2121
containers:
2222
- container: virtual
23-
image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
23+
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15
2424
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
2525

2626
jobs:

‎.stress.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ schedules:
2424
resources:
2525
containers:
2626
- container: sgx
27-
image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-sgx
27+
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-sgx
2828
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
2929

3030
jobs:

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1313

1414
- Added TypeScript `TypedKvSet` and `ccfapp.typedKv<K>` to facilitate set handling from application code.
1515
- Added support for UVM endorsements signed with EC keys (#6231).
16+
- Updated Open Enclave to [0.19.6](https://github.com/openenclave/openenclave/releases/tag/v0.19.6).
1617

1718
### Removed
1819

‎cmake/cpack_settings.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ message(STATUS "Debian package version: ${CPACK_DEBIAN_PACKAGE_VERSION}")
2424
set(CCF_DEB_BASE_DEPENDENCIES "libuv1 (>= 1.34.2);openssl (>=1.1.1f)")
2525
set(CCF_DEB_DEPENDENCIES ${CCF_DEB_BASE_DEPENDENCIES})
2626

27-
set(OE_VERSION "0.19.3")
27+
set(OE_VERSION "0.19.6")
2828
if(COMPILE_TARGET STREQUAL "sgx")
2929
list(APPEND CCF_DEB_DEPENDENCIES
3030
"libc++1-11;libc++abi1-11;open-enclave (>=${OE_VERSION})"

‎cmake/open_enclave.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if(REQUIRE_OPENENCLAVE)
1313
endif()
1414

1515
# Find OpenEnclave package
16-
find_package(OpenEnclave 0.19.3 CONFIG REQUIRED)
16+
find_package(OpenEnclave 0.19.6 CONFIG REQUIRED)
1717

1818
option(USE_OPENSSL_3 "Use OpenSSL 3.x for Open Enclave builds" ON)
1919
if(USE_OPENSSL_3)

‎docker/ccf_ci_built

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# Latest image as of this change
66
ARG platform=sgx
7-
ARG base=ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp-clang-15
7+
ARG base=ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-snp-clang-15
88
FROM ${base}
99

1010
# SSH. Note that this could (should) be done in the base ccf_ci image instead

‎scripts/azure_deployment/arm_aci.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def parse_aci_args(parser: ArgumentParser) -> Namespace:
133133
"--aci-image",
134134
help="The name of the image to deploy in the ACI",
135135
type=str,
136-
default="ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp",
136+
default="ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-snp",
137137
)
138138
parser.add_argument(
139139
"--aci-type",

0 commit comments

Comments
 (0)