From b74a6b2fbd9da1479bb0e53f91d75285ed3b7e47 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Fri, 19 Feb 2021 10:29:21 -0500 Subject: [PATCH] ceph-dev: Disable arm64 notcmalloc and crimson builds Nobody will use them and crimson is failing anyway Signed-off-by: David Galloway --- ceph-dev-cron/config/definitions/ceph-dev-cron.yml | 7 +++++++ .../config/definitions/ceph-dev-new-trigger.yml | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml index e3dcb160..6ea3df23 100644 --- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml +++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml @@ -63,6 +63,7 @@ FORCE=True FLAVOR=notcmalloc DISTROS=centos7 + ARCHS=x86_64 # build nautilus on: # default: bionic xenial centos7 centos8 # notcmalloc: centos7 @@ -88,6 +89,7 @@ FORCE=True DISTROS=centos7 FLAVOR=notcmalloc + ARCHS=x86_64 # build octopus on: # default: focal bionic centos7 centos8 leap15 # notcmalloc: centos8 @@ -113,6 +115,7 @@ FORCE=True DISTROS=centos8 FLAVOR=notcmalloc + ARCHS=x86_64 # build pacific on: # default: focal bionic centos8 leap15 # notcmalloc: centos8 @@ -139,12 +142,14 @@ FORCE=True DISTROS=centos8 FLAVOR=notcmalloc + ARCHS=x86_64 - project: 'ceph-dev' predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True DISTROS=centos8 FLAVOR=crimson + ARCHS=x86_64 # build master on: # default: focal bionic centos8 leap15 # notcmalloc: centos8 @@ -171,12 +176,14 @@ FORCE=True DISTROS=centos8 FLAVOR=notcmalloc + ARCHS=x86_64 - project: 'ceph-dev' predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True DISTROS=centos8 FLAVOR=crimson + ARCHS=x86_64 wrappers: - inject-passwords: 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 33923261..e25041e6 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 @@ -53,6 +53,7 @@ FORCE=True FLAVOR=notcmalloc DISTROS=centos7 + ARCHS=x86_64 # build mimic on: # default: bionic xenial centos7 # notcmalloc: centos7 @@ -78,6 +79,7 @@ FORCE=True DISTROS=centos7 FLAVOR=notcmalloc + ARCHS=x86_64 # build nautilus on: # default: bionic xenial centos7 centos8 # notcmalloc: centos7 @@ -103,6 +105,7 @@ FORCE=True DISTROS=centos7 FLAVOR=notcmalloc + ARCHS=x86_64 # build octopus on: # default: focal bionic centos7 centos8 leap15 # notcmalloc: centos8 @@ -128,6 +131,7 @@ FORCE=True DISTROS=centos8 FLAVOR=notcmalloc + ARCHS=x86_64 # build pacific on: # default: focal bionic centos8 leap15 # notcmalloc: centos8 @@ -154,12 +158,14 @@ FORCE=True DISTROS=centos8 FLAVOR=notcmalloc + ARCHS=x86_64 - project: 'ceph-dev-new' predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True DISTROS=centos8 FLAVOR=crimson + ARCHS=x86_64 # If no release name is found in branch, build on all possible distro/flavor combos (except xenial). # regex matching and 'on-evaluation-failure: run' doesn't work here so triple negative it is. - conditional-step: @@ -185,6 +191,7 @@ FORCE=True DISTROS=centos8 FLAVOR=notcmalloc + ARCHS=x86_64 - trigger-builds: - project: 'ceph-dev-new' predefined-parameters: | @@ -192,6 +199,7 @@ FORCE=True DISTROS=centos8 FLAVOR=crimson + ARCHS=x86_64 wrappers: - inject-passwords: -- 2.39.5