Skip to content

Commit 8a173ba

Browse files
Merge pull request product-os#1429 from product-os/kyle/docker-runs-on
Use hosted Ubuntu 24.04 X64 and ARM runners for Docker by default
2 parents 7b59461 + 3685e28 commit 8a173ba

File tree

4 files changed

+21
-10
lines changed

4 files changed

+21
-10
lines changed

.github/workflows/flowzone.yml

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/tests.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,6 @@ jobs:
6363
multiarch
6464
jobs_timeout_minutes: 30
6565
docker_publish_platform_tags: true
66-
docker_runs_on: >
67-
{
68-
"linux/amd64": ["self-hosted","X64"],
69-
"linux/arm64": ["self-hosted","ARM64"],
70-
"linux/arm/v7": ["self-hosted","ARM64"],
71-
"linux/arm/v6": ["self-hosted","ARM64"]
72-
}
7366
custom_test_matrix: >
7467
{
7568
"value": ["foo", "bar"],

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,13 @@ jobs:
288288
# use `runs_on`.
289289
# Type: string
290290
# Required: false
291-
docker_runs_on: {}
291+
docker_runs_on: >
292+
{
293+
"linux/amd64": ["ubuntu-24.04"],
294+
"linux/arm64": ["ubuntu-24.04-arm"],
295+
"linux/arm/v7": ["ubuntu-24.04-arm"],
296+
"linux/arm/v6": ["ubuntu-24.04-arm"]
297+
}
292298
293299
# JSON array of runner label strings for cloudformation jobs.
294300
# Type: string

flowzone.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,13 @@ on:
952952
description: "JSON key-value pairs mapping platforms to arrays of runner labels. Unlisted platforms will use `runs_on`."
953953
type: string
954954
required: false
955-
default: "{}"
955+
default: >
956+
{
957+
"linux/amd64": ["ubuntu-24.04"],
958+
"linux/arm64": ["ubuntu-24.04-arm"],
959+
"linux/arm/v7": ["ubuntu-24.04-arm"],
960+
"linux/arm/v6": ["ubuntu-24.04-arm"]
961+
}
956962
cloudformation_runs_on:
957963
description: "JSON array of runner label strings for cloudformation jobs."
958964
type: string

0 commit comments

Comments
 (0)