From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 4 Jun 2024 14:14:35 +0000 (-0400)
Subject: Reapply "ceph-dev*: remove centos8 crimson builds"
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b31f42da808a3c301a87d85efab69b4ab0ad114f;p=ceph-build.git

Reapply "ceph-dev*: remove centos8 crimson builds"

This reverts commit 91858f3b4eb006655062188f11d2efd5992080ab.

Signed-off-by: Casey Bodley <cbodley@redhat.com>

Conflicts: quincy +jammy from 8afdc0521c0d3e09f4b3efa5e76089cc98196440
	ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
---

diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
index f39aa0dd..9f8be9af 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 quincy on:
       # default: focal centos8 centos9 leap15
-      # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
           regex: .*quincy.*
@@ -57,16 +56,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.*
@@ -87,7 +79,7 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=centos8 centos9
+                    DISTROS=centos9
                     FLAVOR=crimson
                     ARCHS=x86_64
       # build squid on:
@@ -118,7 +110,7 @@
                     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.*
@@ -139,7 +131,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 3b3a0568..0e2f4660 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 jammy centos8 centos9 leap15
-      # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
           regex: .*quincy.*
@@ -136,16 +135,9 @@
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
                     DISTROS=focal jammy 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 +158,7 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=centos8 centos9
+                    DISTROS=centos9
                     FLAVOR=crimson
                     ARCHS=x86_64
       # build squid on:
@@ -218,7 +210,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
@@ -241,7 +233,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.*
@@ -257,7 +249,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 b944bb2c..2b6df8f8 100644
--- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
+++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
@@ -36,7 +36,6 @@
     builders:
       # build quincy on:
       # default: focal centos8 leap15
-      # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
           regex: .*quincy.*
@@ -53,15 +52,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: .*reef.*
@@ -107,11 +100,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.*
@@ -132,7 +125,7 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=centos8 centos9
+                    DISTROS=centos9
                     FLAVOR=crimson
 
     wrappers: