From e3baa09972794d538f5912b87c2e46825835641f Mon Sep 17 00:00:00 2001 From: David Galloway Date: Tue, 17 Dec 2019 18:24:03 -0500 Subject: [PATCH] ceph-dev*trigger: Set correct distro/flavor combos based on release Based on https://pad.ceph.com/p/py3 Signed-off-by: David Galloway --- .../definitions/ceph-dev-new-trigger.yml | 58 +++++++++++++------ .../config/definitions/ceph-dev-trigger.yml | 51 +++++++++++----- 2 files changed, 77 insertions(+), 32 deletions(-) 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 4d958c8b..044cd386 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 @@ -28,9 +28,12 @@ wipe-workspace: true builders: + # Build luminous on: + # default: centos7 bionic xenial trusty + # notcmalloc: centos7 - conditional-step: condition-kind: regex-match - regex: .*(jewel|kraken|luminous).* + regex: .*luminous.* label: '${GIT_BRANCH}' on-evaluation-failure: dont-run steps: @@ -43,15 +46,20 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True + DISTROS=centos7 bionic xenial trusty - project: 'ceph-dev-new' predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True FLAVOR=notcmalloc + DISTROS=centos7 + # build mimic on: + # default: bionic xenial centos7 + # notcmalloc: centos7 - conditional-step: - condition-kind: shell - condition-command: | - echo "${GIT_BRANCH}" | grep '\(mimic\|nautilus\)' + condition-kind: regex-match + regex: .*mimic.* + label: '${GIT_BRANCH}' on-evaluation-failure: dont-run steps: - shell: @@ -63,17 +71,20 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=bionic xenial centos7 centos8 + DISTROS=bionic xenial centos7 - project: 'ceph-dev-new' predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=centos7 centos8 + DISTROS=centos7 FLAVOR=notcmalloc + # build nautilus on: + # default: bionic xenial centos7 leap15 + # notcmalloc: centos7 - conditional-step: - condition-kind: shell - condition-command: | - echo "${GIT_BRANCH}" | grep -v '\(jewel\|kraken\|luminous\|mimic\|nautilus\)' + condition-kind: regex-match + regex: .*nautilus.* + label: '${GIT_BRANCH}' on-evaluation-failure: dont-run steps: - shell: @@ -85,24 +96,19 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=bionic centos7 leap15 centos8 + DISTROS=bionic xenial centos7 leap15 - project: 'ceph-dev-new' predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=centos7 centos8 + DISTROS=centos7 FLAVOR=notcmalloc - - project: 'ceph-dev-new' - predefined-parameters: | - BRANCH=${GIT_BRANCH} - FORCE=True - DISTROS=bionic - FLAVOR=crimson + # If no release name is found in branch, build on all possible distro/flavor combos - conditional-step: condition-kind: regex-match regex: .*(luminous|mimic|nautilus).* label: '${GIT_BRANCH}' - on-evaluation-failure: dont-run + on-evaluation-failure: run steps: - shell: !include-raw: @@ -113,7 +119,21 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=leap15 + DISTROS=bionic xenial centos7 centos8 leap15 + - trigger-builds: + - project: 'ceph-dev-new' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + DISTROS=centos7 centos8 + FLAVOR=notcmalloc + - trigger-builds: + - project: 'ceph-dev-new' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + DISTROS=bionic + FLAVOR=crimson wrappers: - inject-passwords: diff --git a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml index 168feba6..4c1f96b0 100644 --- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml +++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml @@ -23,8 +23,6 @@ - git: url: https://github.com/ceph/ceph browser: auto - # The default is to build and publish every branch. - # Uncomment this for testing: branches: - 'origin/master' - 'origin/jewel' @@ -38,9 +36,12 @@ wipe-workspace: true builders: + # Build luminous on: + # default: centos7 bionic xenial trusty + # notcmalloc: centos7 - conditional-step: condition-kind: regex-match - regex: .*(master|octopus).* + regex: .*luminous.* label: '${GIT_BRANCH}' on-evaluation-failure: dont-run steps: @@ -53,16 +54,19 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=bionic centos7 centos8 + DISTROS=centos7 bionic xenial trusty - project: 'ceph-dev' predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=centos7 centos8 FLAVOR=notcmalloc + DISTROS=centos7 + # build mimic on: + # default: bionic xenial centos7 + # notcmalloc: centos7 - conditional-step: condition-kind: regex-match - regex: .*(jewel|kraken|luminous).* + regex: .*mimic.* label: '${GIT_BRANCH}' on-evaluation-failure: dont-run steps: @@ -75,14 +79,19 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True + DISTROS=bionic xenial centos7 - project: 'ceph-dev' predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True + DISTROS=centos7 FLAVOR=notcmalloc + # build nautilus on: + # default: bionic xenial centos7 leap15 + # notcmalloc: centos7 - conditional-step: condition-kind: regex-match - regex: .*(luminous|mimic|nautilus|octopus|master).* + regex: .*nautilus.* label: '${GIT_BRANCH}' on-evaluation-failure: dont-run steps: @@ -95,11 +104,21 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=leap15 + DISTROS=bionic xenial centos7 leap15 + - project: 'ceph-dev' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + DISTROS=centos7 + FLAVOR=notcmalloc + # build master and octopus on: + # default: bionic centos7 centos8 leap15 + # notcmalloc: centos7 centos8 + # crimson: bionic - conditional-step: - condition-kind: shell - condition-command: | - echo "${GIT_BRANCH}" | grep -v '\(jewel\|kraken\|luminous\|master\|octopus\)' + condition-kind: regex-match + regex: .*(master|octopus).* + label: '${GIT_BRANCH}' on-evaluation-failure: dont-run steps: - shell: @@ -111,13 +130,19 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=bionic xenial centos7 + DISTROS=bionic centos7 centos8 leap15 - project: 'ceph-dev' predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=centos7 + DISTROS=centos7 centos8 FLAVOR=notcmalloc + - project: 'ceph-dev' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + DISTROS=bionic + FLAVOR=crimson wrappers: - inject-passwords: -- 2.39.5