osmocom
/
osmo-ci
mirror of https://gerrit.osmocom.org/osmo-ci
10
0
Fork 1
Code Releases Activity

jobs/*: update references to rpi4 nodes 

Use the new label that matches all three rpi4 nodes in master-builds and
gerrit-verifications (so the builds can run on any of them). Use the
names of the three nodes in update-osmo-*-on-slaves, so all of them get
updated.

Related: https://jenkins.osmocom.org/jenkins/label/rpi4-raspbian10/
Related: OS#5055
Change-Id: I5b2af801baeb510e7784d6bcd7cabfda4962af0c
This commit is contained in:
Oliver Smith 2021-03-08 14:33:08 +01:00
parent 025c38d521
commit 8c48d2020a
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jobs/gerrit-verifications.yml
View File

@ -91,7 +91,7 @@
- osmo-bsc
- osmo-bts:
slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-deb9build-ansible]
slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian10]
a1_name: FIRMWARE_VERSION
a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, litecell15, oc2g, oc2g-next]
a2_name: BTS_MODEL
@ -100,7 +100,7 @@
a3: !!python/tuple ["1", "0"]
combination_filter: >
(FIRMWARE_VERSION == "master" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
(FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") ||
(FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" && WITH_MANUALS == "0" && label == "rpi4-raspbian10") ||
(FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||
(FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
(FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
@ -167,7 +167,7 @@
- osmo-pcap
- osmo-pcu:
slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-deb9build-ansible]
slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian10]
a1_name: FIRMWARE_VERSION
a1: !!python/tuple [master, v2017.01, litecell15, oc2g]
a2_name: with_vty
@ -183,7 +183,7 @@
(with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="litecell15" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
(with_vty == "True" && with_dsp == "oc2g" && FIRMWARE_VERSION=="oc2g" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
(with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||
(with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible")
(with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "rpi4-raspbian10")
cmd: |
{docker_run} \
-e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
@ -218,7 +218,7 @@
- osmo-sip-connector
- osmo-trx:
slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-deb9build-ansible]
slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-raspbian10]
a1_name: INSTR
a1: !!python/tuple [--with-sse, --without-sse --with-neon, --with-neon-vfpv4]
a2_name: WITH_MANUALS
@ -226,8 +226,8 @@
combination_filter: >
(INSTR == "--without-sse" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||
(INSTR == "--with-sse" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
(INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") ||
(INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible")
(INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-raspbian10") ||
(INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-raspbian10")
cmd: |
export ASCIIDOC_WARNINGS_CHECK=1
export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals"

14
jobs/master-builds.yml
View File

@ -178,7 +178,7 @@
- osmo-bsc
- osmo-bts:
slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-deb9build-ansible]
slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian10]
a1_name: FIRMWARE_VERSION
a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, origin/nrw/litecell15, origin/nrw/oc2g]
a2_name: BTS_MODEL
@ -187,7 +187,7 @@
a3: !!python/tuple ["1", "0"]
combination_filter: >
(FIRMWARE_VERSION == "master" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||
(FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") ||
(FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" && WITH_MANUALS == "0" && label == "rpi4-raspbian10") ||
(FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
(FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
(FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
@ -268,7 +268,7 @@
- osmo-pcap
- osmo-pcu:
slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-deb9build-ansible]
slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian10]
a1_name: FIRMWARE_VERSION
a1: !!python/tuple [master, v2017.01, origin/nrw/litecell15]
a2_name: with_vty
@ -283,7 +283,7 @@
(with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
(with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
(with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||
(with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible")
(with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "rpi4-raspbian10")
cmd: |
{docker_run} \
-e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
@ -313,7 +313,7 @@
email: gerrit-log@lists.osmocom.org laforge@gnumonks.org 246tnt@gmail.com
- osmo-trx:
slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-deb9build-ansible]
slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-raspbian10]
a1_name: INSTR
a1: !!python/tuple [--with-sse, --without-sse, --with-neon, --with-neon-vfpv4]
a2_name: WITH_MANUALS
@ -321,8 +321,8 @@
combination_filter: >
(INSTR == "--without-sse" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||
(INSTR == "--with-sse" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
(INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") ||
(INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible")
(INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-raspbian10") ||
(INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-raspbian10")
cmd: |
export ASCIIDOC_WARNINGS_CHECK=1
export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals"

4
jobs/update-osmo-ci-on-slaves.yml
View File

@ -11,7 +11,9 @@
- host2-deb9build-ansible
- build2-deb9build-ansible
- build2-deb10build-ansible
- rpi4-deb9build-ansible
- rpi4-raspbian10build-ansible-1
- rpi4-raspbian10build-ansible-2
- rpi4-raspbian10build-ansible-3
- gtp0-deb9build
- gtp0-deb10build32
- gtp0-deb10fr

4
jobs/update-osmo-python-on-slaves.yml
View File

@ -10,7 +10,9 @@
- host2-deb9build-ansible
- build2-deb9build-ansible
- build2-deb10build-ansible
- rpi4-deb9build-ansible
- rpi4-raspbian10build-ansible-1
- rpi4-raspbian10build-ansible-2
- rpi4-raspbian10build-ansible-3
properties:
- build-discarder:
days-to-keep: 30