osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/37975?usp=email )
Change subject: jobs/{gerrit,master,update-osmo-ci}: add aarch64 case
......................................................................
jobs/{gerrit,master,update-osmo-ci}: add aarch64 case
The newly set up rpi4-raspbian11build-ansible-1 returns aarch64 for
arch (it has an aarch64 OS instead of 32-bit arm like the others
currently have). Add "aarch64" to the cases next to arm*, so these work
as expected again.
Related: OS#6549
Change-Id: Iaf987d05870d842cd297f5f14c8542bf75835414
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
M scripts/osmo-ci-docker-rebuild.sh
3 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/75/37975/1
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 712f3c9..939186c 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -178,7 +178,7 @@
cmd: |
DOCKER_IMG="{docker_img}"
case "$(arch)" in
- arm*) DOCKER_IMG="$DOCKER_IMG-arm" ;;
+ arm*|aarch64) DOCKER_IMG="$DOCKER_IMG-arm" ;;
esac
{docker_run_ccache} \
-e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
@@ -299,7 +299,7 @@
cmd: |
DOCKER_IMG="{docker_img}"
case "$(arch)" in
- arm*) DOCKER_IMG="$DOCKER_IMG-arm" ;;
+ arm*|aarch64) DOCKER_IMG="$DOCKER_IMG-arm" ;;
esac
{docker_run_ccache} \
-e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
@@ -349,7 +349,7 @@
cmd: |
DOCKER_IMG="{docker_img}"
case "$(arch)" in
- arm*) DOCKER_IMG="$DOCKER_IMG-arm" ;;
+ arm*|aarch64) DOCKER_IMG="$DOCKER_IMG-arm" ;;
esac
{docker_run_ccache} \
-e INSTR="$INSTR" \
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 9a5c1f7..9c3c63a 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -265,7 +265,7 @@
cmd: |
DOCKER_IMG="{docker_img}"
case "$(arch)" in
- arm*) DOCKER_IMG="$DOCKER_IMG-arm" ;;
+ arm*|aarch64) DOCKER_IMG="$DOCKER_IMG-arm" ;;
esac
{docker_run_ccache} \
-e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
@@ -417,7 +417,7 @@
cmd: |
DOCKER_IMG="{docker_img}"
case "$(arch)" in
- arm*) DOCKER_IMG="$DOCKER_IMG-arm" ;;
+ arm*|aarch64) DOCKER_IMG="$DOCKER_IMG-arm" ;;
esac
{docker_run_ccache} \
-e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
@@ -463,7 +463,7 @@
cmd: |
DOCKER_IMG="{docker_img}"
case "$(arch)" in
- arm*) DOCKER_IMG="$DOCKER_IMG-arm" ;;
+ arm*|aarch64) DOCKER_IMG="$DOCKER_IMG-arm" ;;
esac
{docker_run_ccache} \
-e INSTR="$INSTR" \
diff --git a/scripts/osmo-ci-docker-rebuild.sh
b/scripts/osmo-ci-docker-rebuild.sh
index c9e2b63..78bf21c 100755
--- a/scripts/osmo-ci-docker-rebuild.sh
+++ b/scripts/osmo-ci-docker-rebuild.sh
@@ -9,7 +9,7 @@
"debian-bookworm-build" \
"debian-bookworm-erlang"
;;
-arm*)
+arm*|aarch64)
docker_images_require \
"debian-bookworm-build-arm"
;;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37975?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Iaf987d05870d842cd297f5f14c8542bf75835414
Gerrit-Change-Number: 37975
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
