laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/37978?usp=email )
Change subject: jobs/{gerrit,master}: aarch64: use setarch linux32
......................................................................
jobs/{gerrit,master}: aarch64: use setarch linux32
Pretend to be a 32 bit arm machine when running the arm jobs, so in
combination with the related commit we can build test for 32 bit arm
on rpi4s with a 64 bit raspberry pi OS.
Related: docker-playground I93986569a9f492237da28fbc534ac5ccd176f120
Change-Id: Ib082daac0c896787440a58e1aa21f3bb775e4975
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 30 insertions(+), 12 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index e26b4d4..abeb383 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -178,12 +178,15 @@
cmd: |
DOCKER_IMG="{docker_img}"
case "$(arch)" in
- arm*|aarch64) DOCKER_IMG="$DOCKER_IMG-arm" ;;
+ arm*|aarch64)
+ DOCKER_IMG="$DOCKER_IMG-arm"
+ SETARCH_CMD="setarch linux32"
+ ;;
esac
{docker_run_ccache} \
-e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
-e WITH_MANUALS="$WITH_MANUALS" \
- "$DOCKER_IMG" {timeout_cmd} /build/contrib/jenkins_bts_model.sh
"$BTS_MODEL"
+ "$DOCKER_IMG" {timeout_cmd} $SETARCH_CMD
/build/contrib/jenkins_bts_model.sh "$BTS_MODEL"
- osmo_dia2gsup:
repos_url: '{gerrit_url}/erlang/{repos}'
@@ -299,14 +302,17 @@
cmd: |
DOCKER_IMG="{docker_img}"
case "$(arch)" in
- arm*|aarch64) DOCKER_IMG="$DOCKER_IMG-arm" ;;
+ arm*|aarch64)
+ DOCKER_IMG="$DOCKER_IMG-arm"
+ SETARCH_CMD="setarch linux32"
+ ;;
esac
{docker_run_ccache} \
-e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
-e with_vty="$with_vty" \
-e with_dsp="$with_dsp" \
-e WITH_MANUALS="$WITH_MANUALS" \
- "$DOCKER_IMG" {timeout_cmd} /build/contrib/jenkins.sh
+ "$DOCKER_IMG" {timeout_cmd} $SETARCH_CMD
/build/contrib/jenkins.sh
- osmo-python-tests:
repos_url: '{gerrit_url}/python/{repos}'
@@ -349,12 +355,15 @@
cmd: |
DOCKER_IMG="{docker_img}"
case "$(arch)" in
- arm*|aarch64) DOCKER_IMG="$DOCKER_IMG-arm" ;;
+ arm*|aarch64)
+ DOCKER_IMG="$DOCKER_IMG-arm"
+ SETARCH_CMD="setarch linux32"
+ ;;
esac
{docker_run_ccache} \
-e INSTR="$INSTR" \
-e WITH_MANUALS="$WITH_MANUALS" \
- "$DOCKER_IMG" {timeout_cmd} /build/contrib/jenkins.sh
+ "$DOCKER_IMG" {timeout_cmd} $SETARCH_CMD
/build/contrib/jenkins.sh
- osmocom-bb:
pipeline_binpkgs: "debian:12"
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index cceca9c..a3711f0 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -265,12 +265,15 @@
cmd: |
DOCKER_IMG="{docker_img}"
case "$(arch)" in
- arm*|aarch64) DOCKER_IMG="$DOCKER_IMG-arm" ;;
+ arm*|aarch64)
+ DOCKER_IMG="$DOCKER_IMG-arm"
+ SETARCH_CMD="setarch linux32"
+ ;;
esac
{docker_run_ccache} \
-e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
-e WITH_MANUALS="$WITH_MANUALS" \
- "$DOCKER_IMG" {timeout_cmd} /build/contrib/jenkins_bts_model.sh
"$BTS_MODEL"
+ "$DOCKER_IMG" {timeout_cmd} $SETARCH_CMD
/build/contrib/jenkins_bts_model.sh "$BTS_MODEL"
- osmo_dia2gsup:
repos_url: '{gerrit_url}/erlang/{repos}'
@@ -417,14 +420,17 @@
cmd: |
DOCKER_IMG="{docker_img}"
case "$(arch)" in
- arm*|aarch64) DOCKER_IMG="$DOCKER_IMG-arm" ;;
+ arm*|aarch64)
+ DOCKER_IMG="$DOCKER_IMG-arm"
+ SETARCH_CMD="setarch linux32"
+ ;;
esac
{docker_run_ccache} \
-e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
-e with_vty="$with_vty" \
-e with_dsp="$with_dsp" \
-e WITH_MANUALS="$WITH_MANUALS" \
- "$DOCKER_IMG" {timeout_cmd} /build/contrib/jenkins.sh
+ "$DOCKER_IMG" {timeout_cmd} $SETARCH_CMD
/build/contrib/jenkins.sh
- osmo-python-tests:
repos_url: '{gerrit_url}/python/{repos}'
@@ -463,12 +469,15 @@
cmd: |
DOCKER_IMG="{docker_img}"
case "$(arch)" in
- arm*|aarch64) DOCKER_IMG="$DOCKER_IMG-arm" ;;
+ arm*|aarch64)
+ DOCKER_IMG="$DOCKER_IMG-arm"
+ SETARCH_CMD="setarch linux32"
+ ;;
esac
{docker_run_ccache} \
-e INSTR="$INSTR" \
-e WITH_MANUALS="$WITH_MANUALS" \
- "$DOCKER_IMG" {timeout_cmd} /build/contrib/jenkins.sh
+ "$DOCKER_IMG" {timeout_cmd} $SETARCH_CMD
/build/contrib/jenkins.sh
- osmocom-bb
- osmo-sysmon
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37978?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ib082daac0c896787440a58e1aa21f3bb775e4975
Gerrit-Change-Number: 37978
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
