From be5b87f0340ddf60d4505c2a71f7f638af6648d9 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Thu, 29 Oct 2015 16:50:46 -0600 Subject: [PATCH] fix calamari jobs' "branches" definition A bug in jenkins-job-wrecker screwed up the "branches" settings when we imported these jobs from the internal Calamari jenkins server. Fix this. --- .../config/definitions/calamari-clients-precise-vagrant.yml | 3 ++- .../config/definitions/calamari-clients-precise.yml | 3 ++- .../config/definitions/calamari-clients-rhel.yml | 3 ++- .../config/definitions/calamari-clients-rhel7.yml | 3 ++- .../config/definitions/calamari-clients-trusty.yml | 3 ++- .../config/definitions/calamari-clients-vagrant.yml | 3 ++- .../config/definitions/calamari-clients-wheezy.yml | 3 ++- .../config/definitions/calamari-server-centos.yml | 3 ++- .../config/definitions/calamari-server-precise.yml | 3 ++- .../config/definitions/calamari-server-rhel.yml | 3 ++- .../config/definitions/calamari-server-rhel7.yml | 3 ++- .../config/definitions/calamari-server-trusty.yml | 3 ++- .../config/definitions/calamari-server-vagrant.yml | 3 ++- .../config/definitions/calamari-server-wheezy.yml | 3 ++- calamari-server/config/definitions/calamari-server.yml | 3 ++- 15 files changed, 30 insertions(+), 15 deletions(-) diff --git a/calamari-clients-precise-vagrant/config/definitions/calamari-clients-precise-vagrant.yml b/calamari-clients-precise-vagrant/config/definitions/calamari-clients-precise-vagrant.yml index 7828d2a3..4041c9b5 100644 --- a/calamari-clients-precise-vagrant/config/definitions/calamari-clients-precise-vagrant.yml +++ b/calamari-clients-precise-vagrant/config/definitions/calamari-clients-precise-vagrant.yml @@ -30,5 +30,6 @@ scm: - git: basedir: calamari-clients - branches: '*/${BRANCH}' + branches: + - '*/${BRANCH}' url: git@github.com:ceph/calamari-clients.git diff --git a/calamari-clients-precise/config/definitions/calamari-clients-precise.yml b/calamari-clients-precise/config/definitions/calamari-clients-precise.yml index 2be2866e..adc16b51 100644 --- a/calamari-clients-precise/config/definitions/calamari-clients-precise.yml +++ b/calamari-clients-precise/config/definitions/calamari-clients-precise.yml @@ -30,5 +30,6 @@ scm: - git: basedir: calamari-clients - branches: ${BRANCH} + branches: + - ${BRANCH} url: git@github.com:red-hat-storage/romana.git diff --git a/calamari-clients-rhel/config/definitions/calamari-clients-rhel.yml b/calamari-clients-rhel/config/definitions/calamari-clients-rhel.yml index 97f004b0..0e9209f9 100644 --- a/calamari-clients-rhel/config/definitions/calamari-clients-rhel.yml +++ b/calamari-clients-rhel/config/definitions/calamari-clients-rhel.yml @@ -37,5 +37,6 @@ scm: - git: basedir: calamari-clients - branches: '*/${BRANCH}' + branches: + - '*/${BRANCH}' url: git@github.com:ceph/calamari-clients.git diff --git a/calamari-clients-rhel7/config/definitions/calamari-clients-rhel7.yml b/calamari-clients-rhel7/config/definitions/calamari-clients-rhel7.yml index 3a85d341..94900c55 100644 --- a/calamari-clients-rhel7/config/definitions/calamari-clients-rhel7.yml +++ b/calamari-clients-rhel7/config/definitions/calamari-clients-rhel7.yml @@ -37,5 +37,6 @@ scm: - git: basedir: calamari-clients - branches: '*/${BRANCH}' + branches: + - '*/${BRANCH}' url: git@github.com:ceph/calamari-clients.git diff --git a/calamari-clients-trusty/config/definitions/calamari-clients-trusty.yml b/calamari-clients-trusty/config/definitions/calamari-clients-trusty.yml index 5f53d27b..47fa99e2 100644 --- a/calamari-clients-trusty/config/definitions/calamari-clients-trusty.yml +++ b/calamari-clients-trusty/config/definitions/calamari-clients-trusty.yml @@ -37,5 +37,6 @@ scm: - git: basedir: calamari-clients - branches: '*/${BRANCH}' + branches: + - '*/${BRANCH}' url: git@github.com:ceph/calamari-clients.git diff --git a/calamari-clients-vagrant/config/definitions/calamari-clients-vagrant.yml b/calamari-clients-vagrant/config/definitions/calamari-clients-vagrant.yml index d04084aa..a8824760 100644 --- a/calamari-clients-vagrant/config/definitions/calamari-clients-vagrant.yml +++ b/calamari-clients-vagrant/config/definitions/calamari-clients-vagrant.yml @@ -61,5 +61,6 @@ scm: - git: basedir: calamari-clients - branches: '*/$BRANCH' + branches: + - '*/$BRANCH' url: git@github.com:red-hat-storage/calamari-clients.git diff --git a/calamari-clients-wheezy/config/definitions/calamari-clients-wheezy.yml b/calamari-clients-wheezy/config/definitions/calamari-clients-wheezy.yml index 41ba89c6..e3470972 100644 --- a/calamari-clients-wheezy/config/definitions/calamari-clients-wheezy.yml +++ b/calamari-clients-wheezy/config/definitions/calamari-clients-wheezy.yml @@ -37,5 +37,6 @@ scm: - git: basedir: calamari-clients - branches: '*/${BRANCH}' + branches: + - '*/${BRANCH}' url: git@github.com:ceph/calamari-clients.git diff --git a/calamari-server-centos/config/definitions/calamari-server-centos.yml b/calamari-server-centos/config/definitions/calamari-server-centos.yml index 018a8fc6..1be15091 100644 --- a/calamari-server-centos/config/definitions/calamari-server-centos.yml +++ b/calamari-server-centos/config/definitions/calamari-server-centos.yml @@ -33,5 +33,6 @@ scm: - git: basedir: Diamond - branches: '*/calamari' + branches: + - '*/calamari' url: git@github.com:ceph/Diamond diff --git a/calamari-server-precise/config/definitions/calamari-server-precise.yml b/calamari-server-precise/config/definitions/calamari-server-precise.yml index c1a9d983..5c4176a2 100644 --- a/calamari-server-precise/config/definitions/calamari-server-precise.yml +++ b/calamari-server-precise/config/definitions/calamari-server-precise.yml @@ -33,5 +33,6 @@ scm: - git: basedir: Diamond - branches: '*/calamari' + branches: + - '*/calamari' url: git@github.com:ceph/Diamond diff --git a/calamari-server-rhel/config/definitions/calamari-server-rhel.yml b/calamari-server-rhel/config/definitions/calamari-server-rhel.yml index 1372c6ca..30135c08 100644 --- a/calamari-server-rhel/config/definitions/calamari-server-rhel.yml +++ b/calamari-server-rhel/config/definitions/calamari-server-rhel.yml @@ -33,5 +33,6 @@ scm: - git: basedir: Diamond - branches: '*/calamari' + branches: + - '*/calamari' url: git@github.com:ceph/Diamond diff --git a/calamari-server-rhel7/config/definitions/calamari-server-rhel7.yml b/calamari-server-rhel7/config/definitions/calamari-server-rhel7.yml index 58153c50..dcd6236b 100644 --- a/calamari-server-rhel7/config/definitions/calamari-server-rhel7.yml +++ b/calamari-server-rhel7/config/definitions/calamari-server-rhel7.yml @@ -33,5 +33,6 @@ scm: - git: basedir: Diamond - branches: '*/calamari' + branches: + - '*/calamari' url: git@github.com:ceph/Diamond diff --git a/calamari-server-trusty/config/definitions/calamari-server-trusty.yml b/calamari-server-trusty/config/definitions/calamari-server-trusty.yml index 5e266dcf..48430763 100644 --- a/calamari-server-trusty/config/definitions/calamari-server-trusty.yml +++ b/calamari-server-trusty/config/definitions/calamari-server-trusty.yml @@ -33,5 +33,6 @@ scm: - git: basedir: Diamond - branches: '*/calamari' + branches: + - '*/calamari' url: git@github.com:ceph/Diamond diff --git a/calamari-server-vagrant/config/definitions/calamari-server-vagrant.yml b/calamari-server-vagrant/config/definitions/calamari-server-vagrant.yml index fcd48a32..c58e08b2 100644 --- a/calamari-server-vagrant/config/definitions/calamari-server-vagrant.yml +++ b/calamari-server-vagrant/config/definitions/calamari-server-vagrant.yml @@ -50,5 +50,6 @@ scm: - git: basedir: Diamond - branches: '*/calamari' + branches: + - '*/calamari' url: git@github.com:ceph/Diamond diff --git a/calamari-server-wheezy/config/definitions/calamari-server-wheezy.yml b/calamari-server-wheezy/config/definitions/calamari-server-wheezy.yml index 77e29e3d..5da0ed4c 100644 --- a/calamari-server-wheezy/config/definitions/calamari-server-wheezy.yml +++ b/calamari-server-wheezy/config/definitions/calamari-server-wheezy.yml @@ -33,5 +33,6 @@ scm: - git: basedir: Diamond - branches: '*/calamari' + branches: + - '*/calamari' url: git@github.com:ceph/Diamond diff --git a/calamari-server/config/definitions/calamari-server.yml b/calamari-server/config/definitions/calamari-server.yml index 97ea0aa7..ed6701c6 100644 --- a/calamari-server/config/definitions/calamari-server.yml +++ b/calamari-server/config/definitions/calamari-server.yml @@ -60,5 +60,6 @@ scm: - git: basedir: Diamond - branches: '*/calamari' + branches: + - '*/calamari' url: git@github.com:ceph/Diamond -- 2.47.3