Change in osmo-ci[master]: jobs/*: use new label for rpi4 nodes

osmith gerrit-no-reply at lists.osmocom.org
Mon Mar 8 14:04:21 UTC 2021


osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/23271 )


Change subject: jobs/*: use new label for rpi4 nodes
......................................................................

jobs/*: use new label for rpi4 nodes

Use the new rpi4-deb10build-ansible label instead of addressing the old
rpi4-deb9-build-ansible node directly.

Related: https://jenkins.osmocom.org/jenkins/label/rpi4-deb10build-ansible/
Related: OS#5055
Change-Id: I5b2af801baeb510e7784d6bcd7cabfda4962af0c
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
M jobs/update-osmo-ci-on-slaves.yml
M jobs/update-osmo-python-on-slaves.yml
4 files changed, 20 insertions(+), 16 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/71/23271/1

diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index aa8fc76..852cab0 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -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-deb10build-ansible]
           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-deb10build-ansible") ||
             (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-deb10build-ansible]
           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-deb10build-ansible")
           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-deb10build-ansible]
           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-deb10build-ansible") ||
+            (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb10build-ansible")
           cmd: |
             export ASCIIDOC_WARNINGS_CHECK=1
             export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals"
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index fb23553..e3a3511 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -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-deb10build-ansible]
           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-deb10build-ansible") ||
             (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-deb10build-ansible]
           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-deb10build-ansible")
           cmd: |
             {docker_run} \
               -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
@@ -313,7 +313,7 @@
           email: gerrit-log at lists.osmocom.org laforge at gnumonks.org 246tnt at gmail.com
 
       - osmo-trx:
-          slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-deb9build-ansible]
+          slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-deb10build-ansible]
           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-deb10build-ansible") ||
+            (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb10build-ansible")
           cmd: |
             export ASCIIDOC_WARNINGS_CHECK=1
             export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals"
diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml
index 3ff4fa4..cc396b1 100644
--- a/jobs/update-osmo-ci-on-slaves.yml
+++ b/jobs/update-osmo-ci-on-slaves.yml
@@ -11,7 +11,9 @@
             - host2-deb9build-ansible
             - build2-deb9build-ansible
             - build2-deb10build-ansible
-            - rpi4-deb9build-ansible
+            - rpi4-deb10build-ansible-1
+            - rpi4-deb10build-ansible-2
+            - rpi4-deb10build-ansible-3
             - gtp0-deb9build
             - gtp0-deb10build32
             - gtp0-deb10fr
diff --git a/jobs/update-osmo-python-on-slaves.yml b/jobs/update-osmo-python-on-slaves.yml
index 6eaa73a..a20b4a4 100644
--- a/jobs/update-osmo-python-on-slaves.yml
+++ b/jobs/update-osmo-python-on-slaves.yml
@@ -10,7 +10,9 @@
             - host2-deb9build-ansible
             - build2-deb9build-ansible
             - build2-deb10build-ansible
-            - rpi4-deb9build-ansible
+            - rpi4-deb10build-ansible-1
+            - rpi4-deb10build-ansible-2
+            - rpi4-deb10build-ansible-3
     properties:
       - build-discarder:
           days-to-keep: 30

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23271
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I5b2af801baeb510e7784d6bcd7cabfda4962af0c
Gerrit-Change-Number: 23271
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210308/a80f4c62/attachment.htm>


More information about the gerrit-log mailing list