Skip to content

Commit

Permalink
Update base image to 05-12-2024 on main (#6691)
Browse files Browse the repository at this point in the history
  • Loading branch information
achamayou authored Dec 6, 2024
1 parent 04fbd6b commit e34e1f9
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions .azure-pipelines-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ pr: none
resources:
containers:
- container: virtual
image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro

- container: snp
image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro

- container: sgx
image: ghcr.io/microsoft/ccf/ci/sgx:build-08-10-2024
image: ghcr.io/microsoft/ccf/ci/sgx:build-05-12-2024
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:
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines-templates/deploy_aci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
env:
ACR_REGISTRY_RESOURCE_NAME: ccfmsrc
ACR_REGISTRY: ccfmsrc.azurecr.io
BASE_IMAGE: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
BASE_IMAGE: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
- script: |
set -ex
Expand Down
2 changes: 1 addition & 1 deletion .azure_pipelines_snp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ schedules:
resources:
containers:
- container: virtual
image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bencher.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: Continuous Benchmarking with Bencher
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
steps:
- uses: actions/checkout@v4
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-verification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
name: Model Checking - Consistency
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
defaults:
run:
working-directory: tla
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
name: Model Checking - Consensus
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
defaults:
run:
working-directory: tla
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
name: Trace Validation - Consensus
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024

steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
checks:
name: "Format and License Checks"
runs-on: ubuntu-latest
container: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
container: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024

steps:
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
Expand All @@ -44,7 +44,7 @@ jobs:
options: --user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
runs-on: ${{ matrix.platform.nodes }}
container:
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-08-10-2024
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-05-12-2024
options: ${{ matrix.platform.options }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
# Insufficient space to run on public runner, so use custom pool
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
options: --user root

permissions:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/long-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-test') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024

steps:
- uses: actions/checkout@v4
Expand All @@ -35,7 +35,7 @@ jobs:
if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-test') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
name: TSAN
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
name: LTS
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024

steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/long-verification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-verification') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
defaults:
run:
working-directory: tla
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-verification') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
defaults:
run:
working-directory: tla
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
nodes: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
runs-on: ${{ matrix.platform.nodes }}
container:
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-08-10-2024
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-05-12-2024
options: "--user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro ${{ matrix.platform.container_options }}"
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion docker/ccf_ci_built
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Also contains CCF source and build directory

# Latest image as of this change
ARG base=ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
ARG base=ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
FROM ${base}

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

0 comments on commit e34e1f9

Please sign in to comment.