From 1984464b9a80f6857877aac0620737cbc40fd67c Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Tue, 9 Jan 2024 11:45:25 +0200 Subject: [PATCH] ceph-dev*: remove centos8 crimson builds remove any quincy crimson buils (not a supported release) remove reef c8 builds remove main c8 builds Signed-off-by: Matan Breizman --- .../config/definitions/ceph-dev-cron.yml | 16 ++++------------ .../config/definitions/ceph-dev-new-trigger.yml | 17 +++++------------ .../config/definitions/ceph-dev-trigger.yml | 15 ++++----------- 3 files changed, 13 insertions(+), 35 deletions(-) diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml index 2a3f8097..e7aed629 100644 --- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml +++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml @@ -58,7 +58,6 @@ DISTROS=focal bionic centos8 leap15 # build quincy on: # default: focal centos8 centos9 leap15 - # crimson: centos8 - conditional-step: condition-kind: regex-match regex: .*quincy.* @@ -75,16 +74,9 @@ BRANCH=${GIT_BRANCH} FORCE=True DISTROS=focal centos8 centos9 leap15 - - project: 'ceph-dev' - predefined-parameters: | - BRANCH=${GIT_BRANCH} - FORCE=True - DISTROS=centos8 - FLAVOR=crimson - ARCHS=x86_64 # build reef on: # default: jammy focal centos8 centos9 windows - # crimson: centos8 centos9 + # crimson: centos9 - conditional-step: condition-kind: regex-match regex: .*reef.* @@ -105,12 +97,12 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=centos8 centos9 + DISTROS=centos9 FLAVOR=crimson ARCHS=x86_64 # build main on: # default: jammy focal centos8 centos9 windows - # crimson: centos8 centos9 + # crimson: centos9 - conditional-step: condition-kind: regex-match regex: .*main.* @@ -131,7 +123,7 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=centos8 centos9 + DISTROS=centos9 FLAVOR=crimson ARCHS=x86_64 diff --git a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml index ed66fe5a..12e2ceb3 100644 --- a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml +++ b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml @@ -119,7 +119,6 @@ DISTROS=focal bionic centos8 windows # build quincy on: # default: focal centos8 centos9 leap15 - # crimson: centos8 - conditional-step: condition-kind: regex-match regex: .*quincy.* @@ -136,16 +135,10 @@ BRANCH=${GIT_BRANCH} FORCE=True DISTROS=focal centos8 centos9 leap15 - - project: 'ceph-dev-new' - predefined-parameters: | - BRANCH=${GIT_BRANCH} - FORCE=True - DISTROS=centos8 - FLAVOR=crimson ARCHS=x86_64 # build reef on: # default: jammy focal centos8 centos9 windows - # crimson: centos8 centos9 + # crimson: centos9 - conditional-step: condition-kind: regex-match regex: .*reef.* @@ -166,7 +159,7 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=centos8 centos9 + DISTROS=centos9 FLAVOR=crimson ARCHS=x86_64 # If no release name is found in branch, build on all possible distro/flavor combos (except xenial and bionic). @@ -192,7 +185,7 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=centos8 centos9 + DISTROS=centos9 FLAVOR=crimson ARCHS=x86_64 # build only centos9, no crimson, no jaeger @@ -215,7 +208,7 @@ ARCHS=x86_64 # Build only the `crimson` flavour, don't waste resources on the default one. # Useful for the crimson's bug-hunt at Sepia - # crimson: centos8 centos9 + # crimson: centos9 - conditional-step: condition-kind: regex-match regex: .*crimson-only.* @@ -231,7 +224,7 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=centos8 centos9 + DISTROS=centos9 FLAVOR=crimson ARCHS=x86_64 # Build jaegertracing branch on needed env, don't waste resources on the default one. diff --git a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml index 98c5ad66..1a3241cd 100644 --- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml +++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml @@ -97,7 +97,6 @@ DISTROS=focal bionic centos8 leap15 # build quincy on: # default: focal centos8 leap15 - # crimson: centos8 - conditional-step: condition-kind: regex-match regex: .*quincy.* @@ -114,15 +113,9 @@ BRANCH=${GIT_BRANCH} FORCE=True DISTROS=focal centos8 leap15 - - project: 'ceph-dev' - predefined-parameters: | - BRANCH=${GIT_BRANCH} - FORCE=True - DISTROS=centos8 - FLAVOR=crimson # build reef on: # default: jammy focal centos8 centos9 - # crimson: centos8 centos9 + # crimson: centos9 - conditional-step: condition-kind: regex-match regex: .*main.* @@ -143,11 +136,11 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=centos8 centos9 + DISTROS=centos9 FLAVOR=crimson # build main on: # default: jammy focal centos8 centos9 - # crimson: centos8 centos9 + # crimson: centos9 - conditional-step: condition-kind: regex-match regex: .*main.* @@ -168,7 +161,7 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=centos8 centos9 + DISTROS=centos9 FLAVOR=crimson wrappers: -- 2.39.5