diff options
author | Oliver Smith <osmith@sysmocom.de> | 2023-01-23 13:44:28 +0100 |
---|---|---|
committer | osmith <osmith@sysmocom.de> | 2023-01-24 08:04:54 +0000 |
commit | c914967c532b14a08623e44fec264af34149870f (patch) | |
tree | 2817afcd30c9992df15e11d952c5b52e6ecea33b /jobs | |
parent | 989c47bc915e5a7fbca92c984cecde3d59ad3f5e (diff) |
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
Diffstat (limited to 'jobs')
-rw-r--r-- | jobs/gerrit-verifications.yml | 18 | ||||
-rw-r--r-- | jobs/master-builds.yml | 18 |
2 files changed, 30 insertions, 6 deletions
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 |