From faf0702694ea2ccd6fbe19dccab00962d05ba756 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 23 Apr 2024 11:01:04 +0200 Subject: Disable various jobs: rpi4 nodes Related: SYS#6903 Change-Id: I05ca79f0e9b4d29bcbe29cf538e718c1d73990e2 --- jobs/gerrit-verifications.yml | 8 ++------ jobs/master-builds.yml | 8 ++------ jobs/update-osmo-ci-on-slaves.yml | 3 --- jobs/update-osmo-python-on-slaves.yml | 3 --- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 607e909..eb51bdf 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -163,7 +163,6 @@ 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 == "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") || @@ -276,8 +275,7 @@ (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0" && label == "osmocom-gerrit") || (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 == "1" && label == "osmocom-gerrit") cmd: | DOCKER_IMG="{docker_img}" case "$(arch)" in @@ -325,9 +323,7 @@ a2: !!python/tuple ["1", "0"] 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-sse" && WITH_MANUALS == "0" && label == "osmocom-gerrit") cmd: | DOCKER_IMG="{docker_img}" case "$(arch)" in diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index a902be8..abd932b 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -252,7 +252,6 @@ 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 == "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,8 +397,7 @@ (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0" && label == "osmocom-master") || (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 == "1" && label == "osmocom-master") cmd: | DOCKER_IMG="{docker_img}" case "$(arch)" in @@ -443,9 +441,7 @@ a2: !!python/tuple ["1", "0"] 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-sse" && WITH_MANUALS == "0" && label == "osmocom-master") cmd: | DOCKER_IMG="{docker_img}" case "$(arch)" in diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index c826175..a3e0a51 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -11,9 +11,6 @@ - build4-deb12build-ansible - gtp0-deb10fr - host2-deb11build-ansible - - rpi4-raspbian11build-ansible-1 - - rpi4-raspbian11build-ansible-2 - - rpi4-raspbian11build-ansible-3 - simtester properties: - build-discarder: diff --git a/jobs/update-osmo-python-on-slaves.yml b/jobs/update-osmo-python-on-slaves.yml index 0842fba..01af7f8 100644 --- a/jobs/update-osmo-python-on-slaves.yml +++ b/jobs/update-osmo-python-on-slaves.yml @@ -11,9 +11,6 @@ - build3-deb11build-ansible - build4-deb12build-ansible - host2-deb11build-ansible - - rpi4-raspbian11build-ansible-1 - - rpi4-raspbian11build-ansible-2 - - rpi4-raspbian11build-ansible-3 properties: - build-discarder: days-to-keep: 30 -- cgit v1.2.3