From ed9dec1204b84cb55bb4c61d63df2a69505d83d7 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Thu, 22 Mar 2018 12:18:07 -0400 Subject: [PATCH] ceph-{ansible,container}-prs: Fix skip-build-phrase I think JJB was previously not sending 'jenkins do not test' as the skip build phrase so the plugin default '[skip ci]' was being used and working. Since we recently updated JJB, I'm guessing 'jenkins do not test' *is* being configured so '[skip ci]' is no longer working. This commit should allow either phrase to be used. Signed-off-by: David Galloway --- ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml | 6 +++--- .../config/definitions/ceph-container-prs.yml | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml index 28547c75e..d960b1257 100644 --- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml +++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml @@ -124,7 +124,7 @@ allow-whitelist-orgs-as-admins: true org-list: - ceph - skip-build-phrase: '^jenkins do not test.*' + skip-build-phrase: '^jenkins do not test.*|.*\[skip\W+ci\].*' trigger-phrase: '^jenkins test oldstable {release}-{ansible_version}-{scenario}|jenkins test oldstable.*' only-trigger-phrase: true github-hooks: true @@ -206,7 +206,7 @@ allow-whitelist-orgs-as-admins: true org-list: - ceph - skip-build-phrase: '^jenkins do not test.*' + skip-build-phrase: '^jenkins do not test.*|.*\[skip\W+ci\].*' trigger-phrase: '^jenkins test {release}-{ansible_version}-{scenario}|jenkins test all.*' only-trigger-phrase: false github-hooks: true @@ -288,7 +288,7 @@ allow-whitelist-orgs-as-admins: true org-list: - ceph - skip-build-phrase: '^jenkins do not test.*' + skip-build-phrase: '^jenkins do not test.*|.*\[skip\W+ci\].*' trigger-phrase: '^jenkins test {release}-{ansible_version}-{scenario}|jenkins test all.*' only-trigger-phrase: true github-hooks: true diff --git a/ceph-container-prs/config/definitions/ceph-container-prs.yml b/ceph-container-prs/config/definitions/ceph-container-prs.yml index 039b4ec39..8a63f8614 100644 --- a/ceph-container-prs/config/definitions/ceph-container-prs.yml +++ b/ceph-container-prs/config/definitions/ceph-container-prs.yml @@ -48,6 +48,7 @@ allow-whitelist-orgs-as-admins: true org-list: - ceph + skip-build-phrase: '^jenkins do not test.*|.*\[skip\W+ci\].*' trigger-phrase: 'jenkins test ceph_ansible-{ceph-version}-{os}-{test}' only-trigger-phrase: false github-hooks: true -- 2.47.3