From: David Galloway <dgallowa@redhat.com>
Date: Tue, 17 Mar 2020 16:22:00 +0000 (-0400)
Subject: ceph*build: Use new gigantic label
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5ddc01dd76f92a72ebe9d45d39ae3a4e771945e8;p=ceph-build.git

ceph*build: Use new gigantic label

By requiring 'braggi', none of the ARM64 builds would start.  It wouldn't be appropriate to give the arm64 builders a "braggi" label so I'm creating a new "gigantic" label that can apply to the braggi and arm64 builders.

There are no nodes in mita that have a 'gigantic' label so that guarantees builds won't run on OVH ephemeral nodes.

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index 3efcbd3f3..c0a6af239 100644
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-build.yml
@@ -14,16 +14,11 @@
          DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH &&
          (ARCH == "x86_64" || (ARCH == "arm64" && ["xenial", "centos7"].contains(DIST)))
     axes:
-      - axis:
-          type: label-expression
-          name: MACHINE_TYPE
-          values:
-            - braggi
       - axis:
           type: label-expression
           name: MACHINE_SIZE
           values:
-            - huge
+            - gigantic
       - axis:
           type: label-expression
           name: AVAILABLE_ARCH
diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml
index a9b47a4d6..85025db68 100644
--- a/ceph-dev-build/config/definitions/ceph-dev-build.yml
+++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml
@@ -29,16 +29,11 @@
          DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH &&
          (ARCH == "x86_64" || (ARCH == "arm64" && ["xenial", "centos7"].contains(DIST)))
     axes:
-      - axis:
-          type: label-expression
-          name: MACHINE_TYPE
-          values:
-            - braggi
       - axis:
           type: label-expression
           name: MACHINE_SIZE
           values:
-            - huge
+            - gigantic
       - axis:
           type: label-expression
           name: AVAILABLE_ARCH
diff --git a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
index f3e0cd5b6..bd3405565 100644
--- a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
+++ b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
@@ -29,16 +29,11 @@
          DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH &&
          (ARCH == "x86_64" || (ARCH == "arm64" && ["xenial", "centos7", "centos8"].contains(DIST)))
     axes:
-      - axis:
-          type: label-expression
-          name: MACHINE_TYPE
-          values:
-            - braggi
       - axis:
           type: label-expression
           name: MACHINE_SIZE
           values:
-            - huge
+            - gigantic
       - axis:
           type: label-expression
           name: AVAILABLE_ARCH