osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/37976?usp=email )
Change subject: jobs/{master,gerrit}: rpi4-raspbian11 -> raspbian
......................................................................
jobs/{master,gerrit}: rpi4-raspbian11 -> raspbian
Rename the jenkins label rpi4-raspbian11 to raspbian so the name is not
misleading with how we currently use it. One raspberry pi has been
reinstalled with raspbian12 (OS#6549) and we also use it for LX2 with a
raspbian container (OS#5873, therefore remove rpi4 from the name).
The OS running directly on the rpi / in the LXC is not that important
anyway since we run the actual jobs in docker with the latest debian
version (currently 12).
Change-Id: I02dcf3098ffd3fa247c4f43c290d6e3fd809ad45
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/76/37976/1
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 939186c..e26b4d4 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -155,7 +155,7 @@
- osmo-bsc-nat
- osmo-bts:
- slave_axis: !!python/tuple [osmocom-gerrit, rpi4-raspbian11]
+ slave_axis: !!python/tuple [osmocom-gerrit, raspbian]
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
@@ -164,7 +164,7 @@
a3: !!python/tuple ["1", "0"]
combination_filter: >
(FIRMWARE_VERSION == "master" && WITH_MANUALS == "0" && label ==
"osmocom-gerrit") ||
- (FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" &&
WITH_MANUALS == "0" && label == "rpi4-raspbian11") ||
+ (FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" &&
WITH_MANUALS == "0" && label == "raspbian") ||
(FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" &&
WITH_MANUALS == "1" && label == "osmocom-gerrit") ||
(FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" &&
WITH_MANUALS == "0" && label == "osmocom-gerrit") ||
(FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL ==
"sysmo" && WITH_MANUALS == "0" && label == "osmocom-gerrit") ||
@@ -279,7 +279,7 @@
pipeline_binpkgs: "centos:7 debian:10 debian:12" # centos7: SYS#6760
- osmo-pcu:
- slave_axis: !!python/tuple [osmocom-gerrit, rpi4-raspbian11]
+ slave_axis: !!python/tuple [osmocom-gerrit, raspbian]
a1_name: FIRMWARE_VERSION
a1: !!python/tuple [master, v2017.01, litecell15, oc2g]
a2_name: with_vty
@@ -295,7 +295,7 @@
(with_vty == "True" && with_dsp == "lc15" &&
FIRMWARE_VERSION=="litecell15" && WITH_MANUALS == "0" && label ==
"osmocom-gerrit") ||
(with_vty == "True" && with_dsp == "oc2g" &&
FIRMWARE_VERSION=="oc2g" && WITH_MANUALS == "0" && label == "osmocom-gerrit") ||
(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")
+ (with_vty == "False" && with_dsp == "none" &&
FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "raspbian")
cmd: |
DOCKER_IMG="{docker_img}"
case "$(arch)" in
@@ -336,7 +336,7 @@
- osmo-sip-connector
- osmo-trx:
- slave_axis: !!python/tuple [osmocom-gerrit,rpi4-raspbian11]
+ slave_axis: !!python/tuple [osmocom-gerrit,raspbian]
a1_name: INSTR
a1: !!python/tuple [--with-sse, --without-sse, --with-neon,
--with-neon-vfpv4]
a2_name: WITH_MANUALS
@@ -344,8 +344,8 @@
combination_filter: >
(INSTR == "--without-sse" && WITH_MANUALS == "1" && label ==
"osmocom-gerrit") ||
(INSTR == "--with-sse" && WITH_MANUALS == "0" && label ==
"osmocom-gerrit") ||
- (INSTR == "--with-neon" && WITH_MANUALS == "0" && label ==
"rpi4-raspbian11") ||
- (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label ==
"rpi4-raspbian11")
+ (INSTR == "--with-neon" && WITH_MANUALS == "0" && label ==
"raspbian") ||
+ (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label ==
"raspbian")
cmd: |
DOCKER_IMG="{docker_img}"
case "$(arch)" in
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 9c3c63a..cceca9c 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -243,7 +243,7 @@
- osmo-bsc-nat
- osmo-bts:
- slave_axis: !!python/tuple [osmocom-master, rpi4-raspbian11]
+ slave_axis: !!python/tuple [osmocom-master, raspbian]
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
@@ -252,7 +252,7 @@
a3: !!python/tuple ["1", "0"]
combination_filter: >
(FIRMWARE_VERSION == "master" && WITH_MANUALS == "1" && label ==
"osmocom-master") ||
- (FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" &&
WITH_MANUALS == "0" && label == "rpi4-raspbian11") ||
+ (FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" &&
WITH_MANUALS == "0" && label == "raspbian") ||
(FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" &&
WITH_MANUALS == "0" && label == "osmocom-master") ||
(FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" &&
WITH_MANUALS == "0" && label == "osmocom-master") ||
(FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL ==
"sysmo" && WITH_MANUALS == "0" && label == "osmocom-master") ||
@@ -398,7 +398,7 @@
- osmo-pcap
- osmo-pcu:
- slave_axis: !!python/tuple [osmocom-master, rpi4-raspbian11]
+ slave_axis: !!python/tuple [osmocom-master, raspbian]
a1_name: FIRMWARE_VERSION
a1: !!python/tuple [master, v2017.01, origin/nrw/litecell15]
a2_name: with_vty
@@ -413,7 +413,7 @@
(with_vty == "True" && with_dsp == "lc15" &&
FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0" && label ==
"osmocom-master") ||
(with_vty == "True" && with_dsp == "lc15" &&
FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0" && label ==
"osmocom-master") ||
(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")
+ (with_vty == "False" && with_dsp == "none" &&
FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "raspbian")
cmd: |
DOCKER_IMG="{docker_img}"
case "$(arch)" in
@@ -450,7 +450,7 @@
email: [email protected] [email protected]
[email protected]
- osmo-trx:
- slave_axis: !!python/tuple [osmocom-master,rpi4-raspbian11]
+ slave_axis: !!python/tuple [osmocom-master,raspbian]
a1_name: INSTR
a1: !!python/tuple [--with-sse, --without-sse, --with-neon,
--with-neon-vfpv4]
a2_name: WITH_MANUALS
@@ -458,8 +458,8 @@
combination_filter: >
(INSTR == "--without-sse" && WITH_MANUALS == "1" && label ==
"osmocom-master") ||
(INSTR == "--with-sse" && WITH_MANUALS == "0" && label ==
"osmocom-master") ||
- (INSTR == "--with-neon" && WITH_MANUALS == "0" && label ==
"rpi4-raspbian11") ||
- (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label ==
"rpi4-raspbian11")
+ (INSTR == "--with-neon" && WITH_MANUALS == "0" && label ==
"raspbian") ||
+ (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label ==
"raspbian")
cmd: |
DOCKER_IMG="{docker_img}"
case "$(arch)" in
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37976?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I02dcf3098ffd3fa247c4f43c290d6e3fd809ad45
Gerrit-Change-Number: 37976
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
