osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/43528?usp=email ) Change subject: jobs/gerrit,master: osmo-trx arm builds: use lx2 ...................................................................... jobs/gerrit,master: osmo-trx arm builds: use lx2 Use the raspbian container on lx2 instead of the raspberry pi builders for osmo-trx, as the rpis have less memory and building osmo-trx on them frequently leads to aborted builds because of this. Fixes: OS#7083 Change-Id: Ie4f2975ab8d819fc778dc76dcd3d728a3ad27ae2 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/28/43528/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 9398fbf..27bd888 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -448,7 +448,8 @@ - osmo-sip-connector - osmo-trx: - slave_axis: !!python/tuple [osmocom-gerrit,raspbian] + # OS#7083: use lx2 for arm builds because it has enough memory + slave_axis: !!python/tuple [osmocom-gerrit,lx2-raspbian13build-ansible] a1_name: INSTR a1: !!python/tuple [--with-sse, --without-sse, --with-neon, --with-neon-vfpv4] a2_name: WITH_MANUALS @@ -456,8 +457,8 @@ combination_filter: > (INSTR == "--without-sse" && WITH_MANUALS == "1" && label == "osmocom-gerrit") || (INSTR == "--with-sse" && WITH_MANUALS == "0" && label == "osmocom-gerrit") || - (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "raspbian") || - (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "raspbian") + (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "lx2-raspbian13build-ansible") || + (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "lx2-raspbian13build-ansible") cmd: | DOCKER_IMG="{docker_img}" case "$(arch)" in diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 3b8cd47..d915ccb 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -548,7 +548,8 @@ email: jenkins-notifications@lists.osmocom.org laforge@gnumonks.org 246tnt@gmail.com - osmo-trx: - slave_axis: !!python/tuple [osmocom-master,raspbian] + # OS#7083: use lx2 for arm builds because it has enough memory + slave_axis: !!python/tuple [osmocom-master,lx2-raspbian13build-ansible] a1_name: INSTR a1: !!python/tuple [--with-sse, --without-sse, --with-neon, --with-neon-vfpv4] a2_name: WITH_MANUALS @@ -556,8 +557,8 @@ combination_filter: > (INSTR == "--without-sse" && WITH_MANUALS == "1" && label == "osmocom-master") || (INSTR == "--with-sse" && WITH_MANUALS == "0" && label == "osmocom-master") || - (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "raspbian") || - (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "raspbian") + (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "lx2-raspbian13build-ansible") || + (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "lx2-raspbian13build-ansible") cmd: | DOCKER_IMG="{docker_img}" case "$(arch)" in -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43528?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: Ie4f2975ab8d819fc778dc76dcd3d728a3ad27ae2 Gerrit-Change-Number: 43528 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith@sysmocom.de>