Skip to content

Commit c4b9053

Browse files
jjacobellitrxcllnt
jjacobelli
and
trxcllnt
authored
devcontainer: replace VAULT_HOST with AWS_ROLE_ARN (#1423)
* devcontainer: replace VAULT_HOST with AWS_ROLE_ARN Signed-off-by: Jordan Jacobelli <[email protected]> * Update devcontainers base image to support AWS_ROLE_ARN Signed-off-by: Jordan Jacobelli <[email protected]> * Update .devcontainer/llvm18-cuda12.4/devcontainer.json Co-authored-by: Paul Taylor <[email protected]> * Update .devcontainer/nvhpc24.3/devcontainer.json Co-authored-by: Paul Taylor <[email protected]> * Update images used in CI Signed-off-by: Jordan Jacobelli <[email protected]> * Bump CUDA version from 12.4 to 12.6 Signed-off-by: Jordan Jacobelli <[email protected]> * Bump nvhpc to 24.9 in CI Signed-off-by: Jordan Jacobelli <[email protected]> --------- Signed-off-by: Jordan Jacobelli <[email protected]> Co-authored-by: Paul Taylor <[email protected]>
1 parent f11f711 commit c4b9053

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

‎.devcontainer/llvm18-cuda12.0/devcontainer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"image": "rapidsai/devcontainers:24.04-cpp-llvm18-cuda12.0-ubuntu22.04",
2+
"image": "rapidsai/devcontainers:24.12-cpp-llvm18-cuda12.0-ubuntu22.04",
33

44
"hostRequirements": { "gpu": "optional" },
55

@@ -9,7 +9,7 @@
99
"SCCACHE_REGION": "us-east-2",
1010
"SCCACHE_BUCKET": "rapids-sccache-devs",
1111
"SCCACHE_S3_KEY_PREFIX": "nvidia-stdexec-dev",
12-
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
12+
"AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs",
1313
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history"
1414
},
1515

‎.devcontainer/llvm18-cuda12.4/devcontainer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"image": "rapidsai/devcontainers:24.04-cpp-llvm18-cuda12.4-ubuntu22.04",
2+
"image": "rapidsai/devcontainers:24.12-cpp-llvm18-cuda12.6-ubuntu22.04",
33

44
"hostRequirements": { "gpu": "optional" },
55

@@ -9,7 +9,7 @@
99
"SCCACHE_REGION": "us-east-2",
1010
"SCCACHE_BUCKET": "rapids-sccache-devs",
1111
"SCCACHE_S3_KEY_PREFIX": "nvidia-stdexec-dev",
12-
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
12+
"AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs",
1313
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history"
1414
},
1515

‎.devcontainer/nvhpc24.3/devcontainer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"image": "rapidsai/devcontainers:24.04-cpp-nvhpc24.3-ubuntu22.04",
2+
"image": "rapidsai/devcontainers:24.12-cpp-nvhpc24.9-ubuntu22.04",
33

44
"hostRequirements": { "gpu": "optional" },
55

@@ -9,7 +9,7 @@
99
"SCCACHE_REGION": "us-east-2",
1010
"SCCACHE_BUCKET": "rapids-sccache-devs",
1111
"SCCACHE_S3_KEY_PREFIX": "nvidia-stdexec-dev",
12-
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
12+
"AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs",
1313
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history"
1414
},
1515

‎.github/workflows/ci.cpu.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
include:
23-
- { name: "CPU (clang 13, Debug, ubuntu 20.04)", build: "Debug", tag: llvm13-cuda12.4-ubuntu20.04, cxxflags: "-stdlib=libc++" }
24-
- { name: "CPU (clang 13, Release, ubuntu 20.04)", build: "Release", tag: llvm13-cuda12.4-ubuntu20.04, cxxflags: "-stdlib=libc++" }
25-
- { name: "CPU (gcc 11, Debug, ubuntu 22.04)", build: "Debug", tag: gcc11-cuda12.4-ubuntu22.04, cxxflags: "", }
26-
- { name: "CPU (gcc 11, Release, ubuntu 22.04)", build: "Release", tag: gcc11-cuda12.4-ubuntu22.04, cxxflags: "", }
27-
- { name: "CPU (gcc 11, Release, ubuntu 22.04, TSAN)", build: "Release", tag: gcc11-cuda12.4-ubuntu22.04, cxxflags: "-fsanitize=thread" }
28-
- { name: "CPU (gcc 11, Release, ubuntu 22.04, ASAN)", build: "Release", tag: gcc11-cuda12.4-ubuntu22.04, cxxflags: "-fsanitize=address" }
23+
- { name: "CPU (clang 13, Debug, ubuntu 20.04)", build: "Debug", tag: llvm13-cuda12.6-ubuntu20.04, cxxflags: "-stdlib=libc++" }
24+
- { name: "CPU (clang 13, Release, ubuntu 20.04)", build: "Release", tag: llvm13-cuda12.6-ubuntu20.04, cxxflags: "-stdlib=libc++" }
25+
- { name: "CPU (gcc 11, Debug, ubuntu 22.04)", build: "Debug", tag: gcc11-cuda12.6-ubuntu22.04, cxxflags: "", }
26+
- { name: "CPU (gcc 11, Release, ubuntu 22.04)", build: "Release", tag: gcc11-cuda12.6-ubuntu22.04, cxxflags: "", }
27+
- { name: "CPU (gcc 11, Release, ubuntu 22.04, TSAN)", build: "Release", tag: gcc11-cuda12.6-ubuntu22.04, cxxflags: "-fsanitize=thread" }
28+
- { name: "CPU (gcc 11, Release, ubuntu 22.04, ASAN)", build: "Release", tag: gcc11-cuda12.6-ubuntu22.04, cxxflags: "-fsanitize=address" }
2929
container:
3030
options: -u root
31-
image: rapidsai/devcontainers:24.04-cpp-${{matrix.tag}}
31+
image: rapidsai/devcontainers:24.12-cpp-${{matrix.tag}}
3232
env:
3333
SCCACHE_REGION: "us-east-2"
3434
SCCACHE_BUCKET: "rapids-sccache-devs"
@@ -109,8 +109,8 @@ jobs:
109109
- name: Build and test CPU schedulers (Windows)
110110
shell: pwsh
111111
run: |
112-
docker pull rapidsai/devcontainers:24.08-cuda12.4-cl14.39-windows2022
113-
docker run --isolation=process -v "$(pwd):C:/stdexec" rapidsai/devcontainers:24.08-cuda12.4-cl14.39-windows2022 powershell C:/stdexec/.github/workflows/test-windows.ps1 -Compiler '${{ matrix.compiler }}' -Config '${{ matrix.build }}'
112+
docker pull rapidsai/devcontainers:24.12-cuda12.6-cl14.39-windows2022
113+
docker run --isolation=process -v "$(pwd):C:/stdexec" rapidsai/devcontainers:24.12-cuda12.6-cl14.39-windows2022 powershell C:/stdexec/.github/workflows/test-windows.ps1 -Compiler '${{ matrix.compiler }}' -Config '${{ matrix.build }}'
114114
115115
ci-cpu-windows:
116116
runs-on: windows-latest

‎.github/workflows/ci.gpu.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
matrix:
2222
include:
2323
- { name: "clang 18", cuda: "12.0", cxx: "clang++", build: "Release", tag: "llvm18-cuda12.0", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
24-
- { name: "clang 18", cuda: "12.4", cxx: "clang++", build: "Release", tag: "llvm18-cuda12.4", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
25-
- { name: "nvc++ 24.3", cuda: "12.4", cxx: "mpic++", build: "Release", tag: "nvhpc24.3", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
26-
- { name: "nvc++ 24.3", cuda: "12.4", cxx: "mpic++", build: "Debug", tag: "nvhpc24.3", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
24+
- { name: "clang 18", cuda: "12.6", cxx: "clang++", build: "Release", tag: "llvm18-cuda12.6", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
25+
- { name: "nvc++ 24.9", cuda: "12.6", cxx: "mpic++", build: "Release", tag: "nvhpc24.9", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
26+
- { name: "nvc++ 24.9", cuda: "12.6", cxx: "mpic++", build: "Debug", tag: "nvhpc24.9", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
2727
runs-on: linux-${{ matrix.arch }}-gpu-${{ matrix.gpu }}-${{ matrix.driver }}-1
2828
container:
2929
options: -u root
30-
image: rapidsai/devcontainers:24.04-cpp-${{ matrix.tag }}-ubuntu22.04
30+
image: rapidsai/devcontainers:24.12-cpp-${{ matrix.tag }}-ubuntu22.04
3131
env:
3232
SCCACHE_REGION: "us-east-2"
3333
SCCACHE_BUCKET: "rapids-sccache-devs"

0 commit comments

Comments
 (0)