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.

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 7828d2a3a9d2501e63270f605857c6ea03fb6133..4041c9b5bbe9c424ac36a23c867630c41f48a789 100644 (file)
--- 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 2be2866ef126fac9f68da83557863e7c91983fca..adc16b510ec62f064b0efdf5e692e2ffa8fa03c1 100644 (file)
--- 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 97f004b0bc1e0344348bb32bbb344fed1c88a703..0e9209f95cb125f04e1668a4360d26d1a784b09a 100644 (file)
--- 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 3a85d34166bac789115b6dcc7994f0650160edf7..94900c55f1b32211b26bef5f1f4ac0ba4b9c6bb6 100644 (file)
--- 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 5f53d27b2da3c50fda1b8d12c0305a8b9d190c49..47fa99e2a5394af807acf1598ee69237f0aa7f74 100644 (file)
--- 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 d04084aaeb80d94101d3b0f6ccf87675bd8bb9cb..a8824760297d640a5570fffc5d54fbe5c1f03fed 100644 (file)
--- 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 41ba89c6986a5fd183e1bf71ae1639f11ec0496f..e34709726f4fd91658bf903eee019928fa602774 100644 (file)
--- 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 018a8fc6d1f93a1ec93760fd1055374153d039aa..1be150917bb29114859993dbb8c17764eb10ea32 100644 (file)
--- 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 c1a9d983a85ef1105ea42c19a8cf721703ca7e5e..5c4176a23fb83624d9591fbe427e0c5984d1e59a 100644 (file)
--- 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 1372c6ca15183b21e9f74ab75a5430c4d3a8c221..30135c0874ad03bf9bd113cc35297ef46021f1e2 100644 (file)
--- 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 58153c5058f5e773c0134ed0af04c412f7d51a61..dcd6236ba04d3e8772c59140fdbd0b5d48b7e2df 100644 (file)
--- 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 5e266dcf2463f7dad8df62999ce3b3c0fef28957..48430763dd0686f6e4a3cd98a5a55be836ef8c17 100644 (file)
--- 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 fcd48a3251efa787306262db29b2d63082f43e00..c58e08b2652e7ec5e657c4e8e703f6097c3ab2e3 100644 (file)
--- 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 77e29e3dfed1dceaab5d07a61cc6df700180a2c2..5da0ed4c418dae1067eca1f7fc0dae706a22f3de 100644 (file)
--- 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 97ea0aa718a1bbdb9d2601c512ea0c84c732168f..ed6701c66eae5db44c9bed0da5ab29840d84817c 100644 (file)
--- 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