Skip to content

Commit eb3218f

Browse files
achamayouachamayou
authored
[release/4.x] Cherry pick: Update to use latest CI image containing Open Enclave 0.19.6 (#6263) (#6272)
1 parent eab2dd9 commit eb3218f

15 files changed

+27
-19
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-templates/deploy_aci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- script: |
4949
set -ex
5050
docker login -u $ACR_TOKEN_NAME -p $ACR_CI_PUSH_TOKEN_PASSWORD $ACR_REGISTRY
51-
docker pull $ACR_REGISTRY/ccf/ci:2024-05-29-snp-clang15
51+
docker pull $ACR_REGISTRY/ccf/ci:oe-0.19.6-0-snp-clang15
5252
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`
5353
docker push $ACR_REGISTRY/ccf/ci:pr-`git rev-parse HEAD`
5454
name: build_ci_image
@@ -57,7 +57,7 @@ jobs:
5757
ACR_TOKEN_NAME: ci-push-token
5858
ACR_CI_PUSH_TOKEN_PASSWORD: $(ACR_CI_PUSH_TOKEN_PASSWORD)
5959
ACR_REGISTRY: ccfmsrc.azurecr.io
60-
BASE_IMAGE: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp-clang15
60+
BASE_IMAGE: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-snp-clang15
6161
6262
- script: |
6363
set -ex

‎.azure-pipelines.yml

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

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

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

4343
variables:

‎.azure_pipelines_snp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ schedules:
3131
resources:
3232
containers:
3333
- container: virtual
34-
image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
34+
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-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
jobs:

‎.daily.yml

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

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

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

3939
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/ci-checks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
checks:
1111
runs-on: ubuntu-latest
12-
container: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
12+
container: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15
1313

1414
steps:
1515
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

‎.github/workflows/tlaplus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: Model Checking - Consensus
1515
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
1616
container:
17-
image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
17+
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15
1818

1919
steps:
2020
- uses: actions/checkout@v3

‎.multi-thread.yml

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

2222
jobs:

‎.stress.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ schedules:
2020
resources:
2121
containers:
2222
- container: sgx
23-
image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-sgx
23+
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-sgx
2424
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
2525

2626
jobs:

‎CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

8+
## [4.0.18]
9+
10+
[4.0.18]: https://github.com/microsoft/CCF/releases/tag/ccf-4.0.18
11+
12+
### Dependencies
13+
14+
- Updated Open Enclave to [0.19.6](https://github.com/openenclave/openenclave/releases/tag/v0.19.6).
15+
816
## [4.0.17]
917

1018
[4.0.17]: https://github.com/microsoft/CCF/releases/tag/ccf-4.0.17

‎cmake/cpack_settings.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ message(STATUS "Debian package version: ${CPACK_DEBIAN_PACKAGE_VERSION}")
2121
set(CCF_DEB_BASE_DEPENDENCIES "libuv1 (>= 1.34.2);openssl (>=1.1.1)")
2222
set(CCF_DEB_DEPENDENCIES ${CCF_DEB_BASE_DEPENDENCIES})
2323

24-
set(OE_VERSION "0.19.3")
24+
set(OE_VERSION "0.19.6")
2525
if(COMPILE_TARGET STREQUAL "sgx")
2626
list(APPEND CCF_DEB_DEPENDENCIES
2727
"libc++1-11;libc++abi1-11;open-enclave (>=${OE_VERSION})"

‎cmake/open_enclave.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if(NOT COMPILE_TARGET STREQUAL "sgx")
66
endif()
77

88
# Find OpenEnclave package
9-
find_package(OpenEnclave 0.19.3 CONFIG REQUIRED)
9+
find_package(OpenEnclave 0.19.6 CONFIG REQUIRED)
1010
# As well as pulling in openenclave:: targets, this sets variables which can be
1111
# used for our edge cases (eg - for virtual libraries). These do not follow the
1212
# standard naming patterns, for example use OE_INCLUDEDIR rather than

‎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
@@ -132,7 +132,7 @@ def parse_aci_args(parser: ArgumentParser) -> Namespace:
132132
"--aci-image",
133133
help="The name of the image to deploy in the ACI",
134134
type=str,
135-
default="ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp",
135+
default="ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-snp",
136136
)
137137
parser.add_argument(
138138
"--aci-type",

0 commit comments

Comments
 (0)