Skip to content

Commit 2df64d0

Browse files
point at ubuntu-22.04-arm
1 parent fff9381 commit 2df64d0

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

.github/workflows/planned_testing.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128

129129
# risc-v needs ubuntu 24.04 so we get the latest qemu as well as how we
130130
# build llvm. Otherwise we choose ubuntu-22.04 (use a container for both for consistency).
131-
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton' || 'cp-ubuntu-24.04' }}
131+
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'ubuntu-22.04-arm' || 'cp-ubuntu-24.04' }}
132132
container:
133133
image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04-x86-64:latest'
134134
|| ( contains(matrix.target, 'host_aarch64') && 'ghcr.io/alan-forbes-cp/ock_ubuntu_22.04-aarch64:latest'
@@ -161,7 +161,7 @@ jobs:
161161
target: ${{ fromJson(inputs.target_list) }}
162162
exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64_riscv64) }}
163163

164-
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton' || 'cp-ubuntu-24.04' }}
164+
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'ubuntu-22.04-arm' || 'cp-ubuntu-24.04' }}
165165
container:
166166
image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04-x86-64:latest'
167167
|| ( contains(matrix.target, 'host_aarch64') && 'ghcr.io/alan-forbes-cp/ock_ubuntu_22.04-aarch64:latest'
@@ -218,7 +218,7 @@ jobs:
218218
target: ${{ fromJson(inputs.target_list) }}
219219
exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64_riscv64) }}
220220

221-
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton' || 'cp-ubuntu-24.04' }}
221+
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'ubuntu-22.04-arm' || 'cp-ubuntu-24.04' }}
222222
container:
223223
image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04-x86-64:latest'
224224
|| ( contains(matrix.target, 'host_aarch64') && 'ghcr.io/alan-forbes-cp/ock_ubuntu_22.04-aarch64:latest'
@@ -254,7 +254,7 @@ jobs:
254254
target: ${{ fromJson(inputs.target_list) }}
255255
exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64) }}
256256

257-
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton' || 'cp-ubuntu-24.04' }}
257+
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'ubuntu-22.04-arm' || 'cp-ubuntu-24.04' }}
258258
container:
259259
image: ${{ contains(matrix.target, 'host_aarch64') && 'ghcr.io/alan-forbes-cp/ock_ubuntu_22.04-aarch64:latest'
260260
|| 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest' }}
@@ -316,7 +316,7 @@ jobs:
316316
# TODO: For now just linux x86_64 & aarch64
317317
exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64) }}
318318

319-
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton' || 'cp-ubuntu-24.04' }}
319+
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'ubuntu-22.04-arm' || 'cp-ubuntu-24.04' }}
320320
container:
321321
image: ${{ contains(matrix.target, 'host_aarch64') && 'ghcr.io/alan-forbes-cp/ock_ubuntu_22.04-aarch64:latest'
322322
|| 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest' }}
@@ -348,7 +348,7 @@ jobs:
348348
# TODO: For now just linux x86_64 and aarch64
349349
exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64) }}
350350

351-
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton' || 'cp-ubuntu-24.04' }}
351+
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'ubuntu-22.04-arm' || 'cp-ubuntu-24.04' }}
352352
container:
353353
image: ${{ contains(matrix.target, 'host_aarch64') && 'ghcr.io/alan-forbes-cp/ock_ubuntu_22.04-aarch64:latest'
354354
|| 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest' }}

.github/workflows/planned_testing_caller.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ jobs:
2929
# "host_i686_linux",
3030
# "host_refsi_linux",
3131
# "host_x86_64_windows" ]'
32-
target_list: '[ "host_x86_64_linux",
33-
"host_riscv64_linux",
34-
"host_aarch64_linux" ]'
32+
target_list: '[ "host_aarch64_linux" ]'
3533
ock: true
3634
test_tornado: false
3735
test_sycl_cts: true

0 commit comments

Comments
 (0)