Change in osmo-ci[master]: jobs/master,gerrit: use minimal image for arm

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31045 ) Change subject: jobs/master,gerrit: use minimal image for arm ...................................................................... jobs/master,gerrit: use minimal image for arm Building debian-buster-jenkins on the raspberry pis may take > 1h, depending on what changed. It has a lot of things we don't use, so build and use a minimal image with the rpis instead. Closes: OS#5863 Depends: docker-playground I4fb4b48b233acaef815c4c27ec6f17f12cfe836b Change-Id: I73e62fbbf93824c0d37963039de4e00f26a43cbe --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml M scripts/osmo-ci-docker-rebuild.sh 3 files changed, 40 insertions(+), 11 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 9d1acb9..e061b84 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -149,10 +149,14 @@ (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0" && label == "osmocom-gerrit") concurrent: false cmd: | + DOCKER_IMG="{docker_img}" + case "$(arch)" in + arm*) DOCKER_IMG="$DOCKER_IMG-arm" ;; + esac {docker_run} \ -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} /build/contrib/jenkins_bts_model.sh "$BTS_MODEL" - osmo_dia2gsup: repos_url: '{gerrit_url}/erlang/{repos}' @@ -241,12 +245,16 @@ (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1" && label == "osmocom-gerrit") || (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "rpi4-raspbian11") cmd: | + DOCKER_IMG="{docker_img}" + case "$(arch)" in + arm*) DOCKER_IMG="$DOCKER_IMG-arm" ;; + esac {docker_run} \ -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} /build/contrib/jenkins.sh - osmo-python-tests: repos_url: '{gerrit_url}/python/{repos}' @@ -286,10 +294,14 @@ (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-raspbian11") || (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-raspbian11") cmd: | + DOCKER_IMG="{docker_img}" + case "$(arch)" in + arm*) DOCKER_IMG="$DOCKER_IMG-arm" ;; + esac {docker_run} \ -e INSTR="$INSTR" \ -e WITH_MANUALS="$WITH_MANUALS" \ - {docker_img} {timeout_cmd} /build/contrib/jenkins.sh + "$DOCKER_IMG" {timeout_cmd} /build/contrib/jenkins.sh - osmocom-bb: pipeline_binpkgs: false diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 7d1e6da..270ffae 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -232,10 +232,14 @@ (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0" && label == "osmocom-master") concurrent: false cmd: | + DOCKER_IMG="{docker_img}" + case "$(arch)" in + arm*) DOCKER_IMG="$DOCKER_IMG-arm" ;; + esac {docker_run} \ -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} /build/contrib/jenkins_bts_model.sh "$BTS_MODEL" - osmo-e1-hardware: a2_name: JOB_TYPE @@ -349,12 +353,16 @@ (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1" && label == "osmocom-master") || (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "rpi4-raspbian11") cmd: | + DOCKER_IMG="{docker_img}" + case "$(arch)" in + arm*) DOCKER_IMG="$DOCKER_IMG-arm" ;; + esac {docker_run} \ -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} /build/contrib/jenkins.sh - osmo-sgsn: a1_name: IU @@ -388,10 +396,14 @@ (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-raspbian11") || (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-raspbian11") cmd: | + DOCKER_IMG="{docker_img}" + case "$(arch)" in + arm*) DOCKER_IMG="$DOCKER_IMG-arm" ;; + esac {docker_run} \ -e INSTR="$INSTR" \ -e WITH_MANUALS="$WITH_MANUALS" \ - {docker_img} {timeout_cmd} /build/contrib/jenkins.sh + "$DOCKER_IMG" {timeout_cmd} /build/contrib/jenkins.sh - osmocom-bb - osmo-sysmon diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh index f409d45..57005ed 100755 --- a/scripts/osmo-ci-docker-rebuild.sh +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -2,11 +2,16 @@ set -e -x cd "$(dirname "$0")/.." . scripts/common.sh -docker_images_require \ - "debian-buster-jenkins" -if [ "$(arch)" = "x86_64" ]; then +case "$(arch)" in +x86_64) docker_images_require \ "debian-bullseye-erlang" \ - "debian-bullseye-jenkins" -fi + "debian-bullseye-jenkins" \ + "debian-buster-jenkins" + ;; +arm*) + docker_images_require \ + "debian-buster-jenkins-arm" + ;; +esac -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I73e62fbbf93824c0d37963039de4e00f26a43cbe Gerrit-Change-Number: 31045 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged