aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2022-03-03 11:57:16 +0100
committerosmith <osmith@sysmocom.de>2022-05-02 13:29:50 +0000
commit382aebd040b1d478717ab485e5530aa1ec837152 (patch)
tree99a93a4de7c8d20ab784981671bd2a91a8d2fb1e
parent032c0de4b8499a723927231a0f8a1df2ee373bdf (diff)
treewide: rename rpi4-raspbian10 to rpi4-raspbian11
The raspberries have been upgraded to the debian 11 based raspberry pi OS. Adjust the name to avoid confusion. Related: OS#5453 Change-Id: I0b2e08b11d83243e81b2bb4412ffcc9bc59821ff
-rw-r--r--ansible/hosts6
-rw-r--r--jobs/gerrit-verifications.yml14
-rw-r--r--jobs/master-builds.yml14
-rw-r--r--jobs/update-osmo-ci-on-slaves.yml6
-rw-r--r--jobs/update-osmo-python-on-slaves.yml6
5 files changed, 23 insertions, 23 deletions
diff --git a/ansible/hosts b/ansible/hosts
index d88147a..ef0d055 100644
--- a/ansible/hosts
+++ b/ansible/hosts
@@ -14,9 +14,9 @@ build2-deb10build-ansible ansible_host=2a01:4f8:10b:2ad9::1:10 osmocom_jenkins_s
host2-deb9build-ansible ansible_host=2a01:4f8:120:8470::1:3 osmocom_jenkins_slave_fstrim=True
gtp0-deb9build ansible_host=10.34.2.102 osmocom_jenkins_slave_fstrim=True
gtp0-deb10build ansible_host=10.34.2.101 osmocom_jenkins_slave_fstrim=True
-rpi4-raspbian10build-ansible-1 ansible_host=10.9.25.50
-rpi4-raspbian10build-ansible-2 ansible_host=10.9.25.60
-rpi4-raspbian10build-ansible-3 ansible_host=10.9.25.70
+rpi4-raspbian11build-ansible-1 ansible_host=10.9.25.50
+rpi4-raspbian11build-ansible-2 ansible_host=10.9.25.60
+rpi4-raspbian11build-ansible-3 ansible_host=10.9.25.70
[simtester]
simtest ansible_host=10.9.25.80
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 7dc565d..bc0ef58 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -92,7 +92,7 @@
- osmo-bsc-nat
- osmo-bts:
- slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian10]
+ slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian11]
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
@@ -101,7 +101,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-raspbian10") ||
+ (FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" && WITH_MANUALS == "0" && label == "rpi4-raspbian11") ||
(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") ||
@@ -169,7 +169,7 @@
- osmo-pcap
- osmo-pcu:
- slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian10]
+ slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian11]
a1_name: FIRMWARE_VERSION
a1: !!python/tuple [master, v2017.01, litecell15, oc2g]
a2_name: with_vty
@@ -185,7 +185,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-raspbian10")
+ (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "rpi4-raspbian11")
cmd: |
{docker_run} \
-e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
@@ -220,7 +220,7 @@
- osmo-sip-connector
- osmo-trx:
- slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-raspbian10]
+ slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-raspbian11]
a1_name: INSTR
a1: !!python/tuple [--with-sse, --without-sse --with-neon, --with-neon-vfpv4]
a2_name: WITH_MANUALS
@@ -228,8 +228,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-raspbian10") ||
- (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-raspbian10")
+ (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-raspbian11") ||
+ (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-raspbian11")
cmd: |
{docker_run} \
-e INSTR="$INSTR" \
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index bcc517d..4491516 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -186,7 +186,7 @@
- osmo-bsc-nat
- osmo-bts:
- slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian10]
+ slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian11]
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
@@ -195,7 +195,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-raspbian10") ||
+ (FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" && WITH_MANUALS == "0" && label == "rpi4-raspbian11") ||
(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") ||
@@ -280,7 +280,7 @@
- osmo-pcap
- osmo-pcu:
- slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian10]
+ slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian11]
a1_name: FIRMWARE_VERSION
a1: !!python/tuple [master, v2017.01, origin/nrw/litecell15]
a2_name: with_vty
@@ -295,7 +295,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-raspbian10")
+ (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "rpi4-raspbian11")
cmd: |
{docker_run} \
-e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
@@ -325,7 +325,7 @@
email: gerrit-log@lists.osmocom.org laforge@gnumonks.org 246tnt@gmail.com
- osmo-trx:
- slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-raspbian10]
+ slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-raspbian11]
a1_name: INSTR
a1: !!python/tuple [--with-sse, --without-sse, --with-neon, --with-neon-vfpv4]
a2_name: WITH_MANUALS
@@ -333,8 +333,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-raspbian10") ||
- (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-raspbian10")
+ (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-raspbian11") ||
+ (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-raspbian11")
cmd: |
{docker_run} \
-e INSTR="$INSTR" \
diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml
index 9fe2d34..1a0c79c 100644
--- a/jobs/update-osmo-ci-on-slaves.yml
+++ b/jobs/update-osmo-ci-on-slaves.yml
@@ -10,9 +10,9 @@
- host2-deb9build-ansible
- build2-deb9build-ansible
- build2-deb10build-ansible
- - rpi4-raspbian10build-ansible-1
- - rpi4-raspbian10build-ansible-2
- - rpi4-raspbian10build-ansible-3
+ - rpi4-raspbian11build-ansible-1
+ - rpi4-raspbian11build-ansible-2
+ - rpi4-raspbian11build-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 598d867..aa4cfe3 100644
--- a/jobs/update-osmo-python-on-slaves.yml
+++ b/jobs/update-osmo-python-on-slaves.yml
@@ -9,9 +9,9 @@
- host2-deb9build-ansible
- build2-deb9build-ansible
- build2-deb10build-ansible
- - rpi4-raspbian10build-ansible-1
- - rpi4-raspbian10build-ansible-2
- - rpi4-raspbian10build-ansible-3
+ - rpi4-raspbian11build-ansible-1
+ - rpi4-raspbian11build-ansible-2
+ - rpi4-raspbian11build-ansible-3
properties:
- build-discarder:
days-to-keep: 30