From 21aef3c0cecfbee79b1ebb0204f13b257dde92e0 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Sun, 6 Apr 2025 13:54:04 +0300 Subject: [PATCH] ceph-dev*: Remove Crimson un-supported builds Crimson should be built only for main and T. Remove R and S builds. Signed-off-by: Matan Breizman --- .../config/definitions/ceph-dev-trigger.yml | 14 -------------- .../config/definitions/ceph-dev-cron.yml | 16 ---------------- .../config/definitions/ceph-dev-new-trigger.yml | 16 +--------------- 3 files changed, 1 insertion(+), 45 deletions(-) diff --git a/attic/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/attic/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml index deeb4bbe..f0e47c07 100644 --- a/attic/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml +++ b/attic/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml @@ -55,7 +55,6 @@ DISTROS=focal centos8 leap15 # build reef on: # default: jammy focal centos8 centos9 - # crimson: centos9 - conditional-step: condition-kind: regex-match regex: .*reef.* @@ -72,15 +71,8 @@ BRANCH=${GIT_BRANCH} FORCE=True DISTROS=jammy focal centos8 centos9 - - project: 'ceph-dev' - predefined-parameters: | - BRANCH=${GIT_BRANCH} - FORCE=True - DISTROS=centos8 centos9 - FLAVOR=crimson # build squid on: # default: jammy focal centos8 centos9 - # crimson: centos8 centos9 - conditional-step: condition-kind: regex-match regex: .*squid.* @@ -97,12 +89,6 @@ BRANCH=${GIT_BRANCH} FORCE=True DISTROS=jammy focal centos8 centos9 - - project: 'ceph-dev' - predefined-parameters: | - BRANCH=${GIT_BRANCH} - FORCE=True - DISTROS=centos9 - FLAVOR=crimson # build tentacle on: # default: jammy focal centos8 centos9 # crimson: centos8 centos9 diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml index b614f1e7..fe9cdb04 100644 --- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml +++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml @@ -40,7 +40,6 @@ builders: # build reef on: # default: jammy focal centos9 windows - # crimson: centos9 - conditional-step: condition-kind: regex-match regex: .*reef.* @@ -57,16 +56,8 @@ BRANCH=${{GIT_BRANCH}} FORCE=True DISTROS=jammy focal centos9 windows - - project: 'ceph-dev' - predefined-parameters: | - BRANCH=${{GIT_BRANCH}} - FORCE=True - DISTROS=centos9 - FLAVOR=crimson - ARCHS=x86_64 # build squid on: # default: jammy centos9 windows - # crimson: centos9 - conditional-step: condition-kind: regex-match regex: .*squid.* @@ -83,13 +74,6 @@ BRANCH=${{GIT_BRANCH}} FORCE=True DISTROS=jammy centos9 windows - - project: 'ceph-dev' - predefined-parameters: | - BRANCH=${{GIT_BRANCH}} - FORCE=True - DISTROS=centos9 - FLAVOR=crimson - ARCHS=x86_64 # build tentacle on: # default: jammy centos9 windows # crimson: centos9 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 807766d3..645508ce 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 @@ -31,7 +31,6 @@ builders: # build reef on: # default: jammy focal centos9 windows - # crimson: centos9 - conditional-step: condition-kind: regex-match regex: .*reef.* @@ -49,15 +48,9 @@ FORCE=True DISTROS=jammy focal centos9 windows - project: 'ceph-dev-new' - predefined-parameters: | - BRANCH=${{GIT_BRANCH}} - FORCE=True - DISTROS=centos9 - FLAVOR=crimson - ARCHS=x86_64 + # build squid on: # default: jammy centos9 windows - # crimson: centos9 - conditional-step: condition-kind: regex-match regex: .*squid.* @@ -74,13 +67,6 @@ BRANCH=${{GIT_BRANCH}} FORCE=True DISTROS=jammy centos9 windows - - project: 'ceph-dev-new' - predefined-parameters: | - BRANCH=${{GIT_BRANCH}} - FORCE=True - DISTROS=centos9 - FLAVOR=crimson - ARCHS=x86_64 # build tentacle on: # default: jammy centos9 windows # crimson: centos9 -- 2.47.3