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 <dgallowa@redhat.com>

diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
index 28547c75ef88ab74479c6e4a87e9d2b15416ea63..d960b1257e8b0754b8d4aceb2481f1384006a90a 100644 (file)
--- 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 039b4ec39bc0eb7e7e1c690306bce09b4351e995..8a63f8614a7431a45fc70e96d40573fdf47ad5ad 100644 (file)
--- 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