fixeria has uploaded this change for review.
jobs/{gerrit,master}: use debian-trixie-build-arm for osmo-pcu
Now that we've fixed the "member access within misaligned address"
issues, we can finally use debian:trixie (ARM) for osmo-pcu too.
Change-Id: I8035264aaa256f5f03b4dee1e7b15d7132a051b6
Related: libosmocore.git I0424e76e76d8aa9402bd1a5aefe789de16e72fae
Related: osmo-pcu.git I39abce68c5678704eea2ad1e330419f645aa4cfd
Related: OS#6858, OS#6857
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
M scripts/osmo-ci-docker-rebuild.sh
3 files changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/83/43483/1
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index ed01050..9398fbf 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -384,7 +384,7 @@
DOCKER_IMG="{docker_img}"
case "$(arch)" in
arm*|aarch64)
- DOCKER_IMG="$USER/debian-bookworm-build-arm" # OS#6858
+ DOCKER_IMG="$DOCKER_IMG-arm"
SETARCH_CMD="setarch linux32"
;;
esac
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 8831152..3b8cd47 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -485,7 +485,7 @@
DOCKER_IMG="{docker_img}"
case "$(arch)" in
arm*|aarch64)
- DOCKER_IMG="$USER/debian-bookworm-build-arm" # OS#6858
+ DOCKER_IMG="$DOCKER_IMG-arm"
SETARCH_CMD="setarch linux32"
;;
esac
diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh
index d901826..4461e66 100755
--- a/scripts/osmo-ci-docker-rebuild.sh
+++ b/scripts/osmo-ci-docker-rebuild.sh
@@ -13,8 +13,6 @@
;;
arm*|aarch64)
# OS#6627: need to run a separate "docker pull" command with platform
- # OS#6858: still need bookworm for osmo-pcu
- docker pull docker.io/arm32v7/debian:bookworm --platform="linux/arm/v7"
docker pull docker.io/arm32v7/debian:trixie --platform="linux/arm/v7"
export NO_DOCKER_IMAGE_PULL=1
To view, visit change 43483. To unsubscribe, or for help writing mail filters, visit settings.