From 3a0b799b55b4dcf5c7f82a75073a3a6995399d7f Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 7 Dec 2017 18:32:21 +0800 Subject: [PATCH] ceph-*-trigger: do not build new branches on trusty by "new branches", i mean any branch whose name does not contain "jewel" or "luminous". see https://docs.openstack.org/infra/jenkins-job-builder/builders.html#builders.conditional-step and https://wiki.jenkins.io/display/JENKINS/Conditional+BuildStep+Plugin Signed-off-by: Kefu Chai --- .../definitions/ceph-dev-new-trigger.yml | 55 ++++++++++++++----- .../config/definitions/ceph-dev-trigger.yml | 55 ++++++++++++++----- 2 files changed, 82 insertions(+), 28 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 98d58c46..951b9b10 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,20 +28,47 @@ wipe-workspace: true builders: - - shell: - !include-raw: - - ../../../scripts/build_utils.sh - - ../../build/notify - - trigger-builds: - - project: 'ceph-dev-new' - predefined-parameters: | - BRANCH=${GIT_BRANCH} - FORCE=True - - project: 'ceph-dev-new' - predefined-parameters: | - BRANCH=${GIT_BRANCH} - FORCE=True - FLAVOR=notcmalloc + - conditional-step: + condition-kind: regex-match + regex: .*(jewel|luminous).* + label: '${GIT_BRANCH}' + on-evaluation-failure: dont-run + steps: + - shell: + !include-raw: + - ../../../scripts/build_utils.sh + - ../../build/notify + - trigger-builds: + - project: 'ceph-dev-new' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + - project: 'ceph-dev-new' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + - conditional-step: + condition-kind: shell + condition-command: | + echo "${GIT_BRANCH}" | grep -v '\(jewel\|luminous\)' + on-evaluation-failure: dont-run + steps: + - shell: + !include-raw: + - ../../../scripts/build_utils.sh + - ../../build/notify + - trigger-builds: + - project: 'ceph-dev-new' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + DISTROS="xenial centos7" + - project: 'ceph-dev-new' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + DISTROS="xenial centos7" + FLAVOR=notcmalloc 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 43f17381..b6a73698 100644 --- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml +++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml @@ -37,20 +37,47 @@ wipe-workspace: true builders: - - shell: - !include-raw: - - ../../../scripts/build_utils.sh - - ../../build/notify - - trigger-builds: - - project: 'ceph-dev' - predefined-parameters: | - BRANCH=${GIT_BRANCH} - FORCE=True - - project: 'ceph-dev' - predefined-parameters: | - BRANCH=${GIT_BRANCH} - FORCE=True - FLAVOR=notcmalloc + - conditional-step: + condition-kind: regex-match + regex: .*(jewel|luminous).* + label: '${GIT_BRANCH}' + on-evaluation-failure: dont-run + steps: + - shell: + !include-raw: + - ../../../scripts/build_utils.sh + - ../../build/notify + - trigger-builds: + - project: 'ceph-dev' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + - project: 'ceph-dev' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + - conditional-step: + condition-kind: shell + condition-command: | + echo "${GIT_BRANCH}" | grep -v '\(jewel\|luminous\)' + on-evaluation-failure: dont-run + steps: + - shell: + !include-raw: + - ../../../scripts/build_utils.sh + - ../../build/notify + - trigger-builds: + - project: 'ceph-dev' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + DISTROS="xenial centos7" + - project: 'ceph-dev' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + DISTROS="xenial centos7" + FLAVOR=notcmalloc wrappers: - inject-passwords: -- 2.39.5