<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/23271">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">jobs/*: use new label for rpi4 nodes<br><br>Use the new rpi4-deb10build-ansible label instead of addressing the old<br>rpi4-deb9-build-ansible node directly.<br><br>Related: https://jenkins.osmocom.org/jenkins/label/rpi4-deb10build-ansible/<br>Related: OS#5055<br>Change-Id: I5b2af801baeb510e7784d6bcd7cabfda4962af0c<br>---<br>M jobs/gerrit-verifications.yml<br>M jobs/master-builds.yml<br>M jobs/update-osmo-ci-on-slaves.yml<br>M jobs/update-osmo-python-on-slaves.yml<br>4 files changed, 20 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/71/23271/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml</span><br><span>index aa8fc76..852cab0 100644</span><br><span>--- a/jobs/gerrit-verifications.yml</span><br><span>+++ b/jobs/gerrit-verifications.yml</span><br><span>@@ -91,7 +91,7 @@</span><br><span>       - osmo-bsc</span><br><span> </span><br><span>       - osmo-bts:</span><br><span style="color: hsl(0, 100%, 40%);">-          slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-deb9build-ansible]</span><br><span style="color: hsl(120, 100%, 40%);">+          slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-deb10build-ansible]</span><br><span>           a1_name: FIRMWARE_VERSION</span><br><span>           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]</span><br><span>           a2_name: BTS_MODEL</span><br><span>@@ -100,7 +100,7 @@</span><br><span>           a3: !!python/tuple ["1", "0"]</span><br><span>           combination_filter: ></span><br><span>             (FIRMWARE_VERSION == "master" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" && WITH_MANUALS == "0" && label == "rpi4-deb10build-ansible") ||</span><br><span>             (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||</span><br><span>             (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span>             (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span>@@ -167,7 +167,7 @@</span><br><span>       - osmo-pcap</span><br><span> </span><br><span>       - osmo-pcu:</span><br><span style="color: hsl(0, 100%, 40%);">-          slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-deb9build-ansible]</span><br><span style="color: hsl(120, 100%, 40%);">+          slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-deb10build-ansible]</span><br><span>           a1_name: FIRMWARE_VERSION</span><br><span>           a1: !!python/tuple [master, v2017.01, litecell15, oc2g]</span><br><span>           a2_name: with_vty</span><br><span>@@ -183,7 +183,7 @@</span><br><span>             (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="litecell15" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span>             (with_vty == "True" && with_dsp == "oc2g" && FIRMWARE_VERSION=="oc2g" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span>             (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible")</span><br><span style="color: hsl(120, 100%, 40%);">+            (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "rpi4-deb10build-ansible")</span><br><span>           cmd: |</span><br><span>             {docker_run} \</span><br><span>               -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \</span><br><span>@@ -218,7 +218,7 @@</span><br><span>       - osmo-sip-connector</span><br><span> </span><br><span>       - osmo-trx:</span><br><span style="color: hsl(0, 100%, 40%);">-          slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-deb9build-ansible]</span><br><span style="color: hsl(120, 100%, 40%);">+          slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-deb10build-ansible]</span><br><span>           a1_name: INSTR</span><br><span>           a1: !!python/tuple [--with-sse, --without-sse --with-neon, --with-neon-vfpv4]</span><br><span>           a2_name: WITH_MANUALS</span><br><span>@@ -226,8 +226,8 @@</span><br><span>           combination_filter: ></span><br><span>             (INSTR == "--without-sse" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||</span><br><span>             (INSTR == "--with-sse" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible")</span><br><span style="color: hsl(120, 100%, 40%);">+            (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-deb10build-ansible") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb10build-ansible")</span><br><span>           cmd: |</span><br><span>             export ASCIIDOC_WARNINGS_CHECK=1</span><br><span>             export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals"</span><br><span>diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml</span><br><span>index fb23553..e3a3511 100644</span><br><span>--- a/jobs/master-builds.yml</span><br><span>+++ b/jobs/master-builds.yml</span><br><span>@@ -178,7 +178,7 @@</span><br><span>       - osmo-bsc</span><br><span> </span><br><span>       - osmo-bts:</span><br><span style="color: hsl(0, 100%, 40%);">-          slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-deb9build-ansible]</span><br><span style="color: hsl(120, 100%, 40%);">+          slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-deb10build-ansible]</span><br><span>           a1_name: FIRMWARE_VERSION</span><br><span>           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]</span><br><span>           a2_name: BTS_MODEL</span><br><span>@@ -187,7 +187,7 @@</span><br><span>           a3: !!python/tuple ["1", "0"]</span><br><span>           combination_filter: ></span><br><span>             (FIRMWARE_VERSION == "master" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" && WITH_MANUALS == "0" && label == "rpi4-deb10build-ansible") ||</span><br><span>             (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span>             (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span>             (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span>@@ -268,7 +268,7 @@</span><br><span>       - osmo-pcap</span><br><span> </span><br><span>       - osmo-pcu:</span><br><span style="color: hsl(0, 100%, 40%);">-          slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-deb9build-ansible]</span><br><span style="color: hsl(120, 100%, 40%);">+          slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-deb10build-ansible]</span><br><span>           a1_name: FIRMWARE_VERSION</span><br><span>           a1: !!python/tuple [master, v2017.01, origin/nrw/litecell15]</span><br><span>           a2_name: with_vty</span><br><span>@@ -283,7 +283,7 @@</span><br><span>             (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span>             (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span>             (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible")</span><br><span style="color: hsl(120, 100%, 40%);">+            (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "rpi4-deb10build-ansible")</span><br><span>           cmd: |</span><br><span>             {docker_run} \</span><br><span>               -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \</span><br><span>@@ -313,7 +313,7 @@</span><br><span>           email: gerrit-log@lists.osmocom.org laforge@gnumonks.org 246tnt@gmail.com</span><br><span> </span><br><span>       - osmo-trx:</span><br><span style="color: hsl(0, 100%, 40%);">-          slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-deb9build-ansible]</span><br><span style="color: hsl(120, 100%, 40%);">+          slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-deb10build-ansible]</span><br><span>           a1_name: INSTR</span><br><span>           a1: !!python/tuple [--with-sse, --without-sse, --with-neon, --with-neon-vfpv4]</span><br><span>           a2_name: WITH_MANUALS</span><br><span>@@ -321,8 +321,8 @@</span><br><span>           combination_filter: ></span><br><span>             (INSTR == "--without-sse" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||</span><br><span>             (INSTR == "--with-sse" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible")</span><br><span style="color: hsl(120, 100%, 40%);">+            (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-deb10build-ansible") ||</span><br><span style="color: hsl(120, 100%, 40%);">+            (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb10build-ansible")</span><br><span>           cmd: |</span><br><span>             export ASCIIDOC_WARNINGS_CHECK=1</span><br><span>             export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals"</span><br><span>diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml</span><br><span>index 3ff4fa4..cc396b1 100644</span><br><span>--- a/jobs/update-osmo-ci-on-slaves.yml</span><br><span>+++ b/jobs/update-osmo-ci-on-slaves.yml</span><br><span>@@ -11,7 +11,9 @@</span><br><span>             - host2-deb9build-ansible</span><br><span>             - build2-deb9build-ansible</span><br><span>             - build2-deb10build-ansible</span><br><span style="color: hsl(0, 100%, 40%);">-            - rpi4-deb9build-ansible</span><br><span style="color: hsl(120, 100%, 40%);">+            - rpi4-deb10build-ansible-1</span><br><span style="color: hsl(120, 100%, 40%);">+            - rpi4-deb10build-ansible-2</span><br><span style="color: hsl(120, 100%, 40%);">+            - rpi4-deb10build-ansible-3</span><br><span>             - gtp0-deb9build</span><br><span>             - gtp0-deb10build32</span><br><span>             - gtp0-deb10fr</span><br><span>diff --git a/jobs/update-osmo-python-on-slaves.yml b/jobs/update-osmo-python-on-slaves.yml</span><br><span>index 6eaa73a..a20b4a4 100644</span><br><span>--- a/jobs/update-osmo-python-on-slaves.yml</span><br><span>+++ b/jobs/update-osmo-python-on-slaves.yml</span><br><span>@@ -10,7 +10,9 @@</span><br><span>             - host2-deb9build-ansible</span><br><span>             - build2-deb9build-ansible</span><br><span>             - build2-deb10build-ansible</span><br><span style="color: hsl(0, 100%, 40%);">-            - rpi4-deb9build-ansible</span><br><span style="color: hsl(120, 100%, 40%);">+            - rpi4-deb10build-ansible-1</span><br><span style="color: hsl(120, 100%, 40%);">+            - rpi4-deb10build-ansible-2</span><br><span style="color: hsl(120, 100%, 40%);">+            - rpi4-deb10build-ansible-3</span><br><span>     properties:</span><br><span>       - build-discarder:</span><br><span>           days-to-keep: 30</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/23271">change 23271</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ci/+/23271"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I5b2af801baeb510e7784d6bcd7cabfda4962af0c </div>
<div style="display:none"> Gerrit-Change-Number: 23271 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>