From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Wed, 8 Apr 2015 20:46:29 +0000 (-0400)
Subject: Fix {branch} parameter not found
X-Git-Tag: arno.2015.1.0~134
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c411eb7b50c9da32c5ffe2f8e01c2c5ef03fe70c;p=releng.git

Fix {branch} parameter not found

JIRA: 0000
Change-Id: I784e48c181bc2c1fda7d52539e8775a253d0b128
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/jjb/availability/availability.yml b/jjb/availability/availability.yml
index 972e28556..a0346cf7d 100644
--- a/jjb/availability/availability.yml
+++ b/jjb/availability/availability.yml
@@ -2,7 +2,7 @@
     name: availability
     jobs:
         - 'availability-test'
-        - 'availability-daily-master'
+        - 'availability-daily-{stream}'
         - 'availability-merge'
         - 'availability-verify'
 
@@ -31,7 +31,7 @@
             echo "Hello world from availability"
 
 - job-template:
-    name: 'availability-daily-master'
+    name: 'availability-daily-{stream}'
 
     # Job template for daily builders
     #
diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml
index 3f86f0da7..26abe4585 100644
--- a/jjb/conductor/conductor.yml
+++ b/jjb/conductor/conductor.yml
@@ -2,7 +2,7 @@
     name: conductor
     jobs:
         - 'conductor-test'
-        - 'conductor-daily-master'
+        - 'conductor-daily-{stream}'
         - 'conductor-merge'
         - 'conductor-verify'
 
@@ -31,7 +31,7 @@
             echo "Hello world from conductor"
 
 - job-template:
-    name: 'conductor-daily-master'
+    name: 'conductor-daily-{stream}'
 
     # Job template for daily builders
     #
diff --git a/jjb/copper/copper.yml b/jjb/copper/copper.yml
index c87d0b081..ab7796070 100644
--- a/jjb/copper/copper.yml
+++ b/jjb/copper/copper.yml
@@ -2,7 +2,7 @@
     name: copper
     jobs:
         - 'copper-test'
-        - 'copper-daily-master'
+        - 'copper-daily-{stream}'
         - 'copper-merge'
         - 'copper-verify'
 
@@ -31,7 +31,7 @@
             echo "Hello world from copper"
 
 - job-template:
-    name: 'copper-daily-master'
+    name: 'copper-daily-{stream}'
 
     # Job template for daily builders
     #
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 9bcf20b3c..e92330f71 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -2,7 +2,7 @@
     name: doctor
     jobs:
         - 'doctor-test'
-        - 'doctor-daily-master'
+        - 'doctor-daily-{stream}'
         - 'doctor-merge'
         - 'doctor-verify'
 
@@ -31,7 +31,7 @@
             echo "Hello world from doctor"
 
 - job-template:
-    name: 'doctor-daily-master'
+    name: 'doctor-daily-{stream}'
 
     # Job template for daily builders
     #
diff --git a/jjb/dpacc/dpacc.yml b/jjb/dpacc/dpacc.yml
index 041432742..2e46c559f 100644
--- a/jjb/dpacc/dpacc.yml
+++ b/jjb/dpacc/dpacc.yml
@@ -2,7 +2,7 @@
     name: dpacc
     jobs:
         - 'dpacc-test'
-        - 'dpacc-daily-master'
+        - 'dpacc-daily-{stream}'
         - 'dpacc-merge'
         - 'dpacc-verify'
 
@@ -31,7 +31,7 @@
             echo "Hello world from dpacc"
 
 - job-template:
-    name: 'dpacc-daily-master'
+    name: 'dpacc-daily-{stream}'
 
     # Job template for daily builders
     #
diff --git a/jjb/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml
index 85ac62351..0facb1008 100644
--- a/jjb/fastpathmetrics/fastpathmetrics.yml
+++ b/jjb/fastpathmetrics/fastpathmetrics.yml
@@ -2,7 +2,7 @@
     name: fastpathmetrics
     jobs:
         - 'fastpathmetrics-test'
-        - 'fastpathmetrics-daily-master'
+        - 'fastpathmetrics-daily-{stream}'
         - 'fastpathmetrics-merge'
         - 'fastpathmetrics-verify'
 
@@ -31,7 +31,7 @@
             echo "Hello world from fastpathmetrics"
 
 - job-template:
-    name: 'fastpathmetrics-daily-master'
+    name: 'fastpathmetrics-daily-{stream}'
 
     # Job template for daily builders
     #
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index c567c1959..9ff9712e7 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -2,7 +2,7 @@
     name: functest
     jobs:
         - 'functest-test'
-        - 'functest-daily-master'
+        - 'functest-daily-{stream}'
         - 'functest-merge'
         - 'functest-verify'
         - 'functest-build-docs'
@@ -32,7 +32,7 @@
             echo "Hello world from functest"
 
 - job-template:
-    name: 'functest-daily-master'
+    name: 'functest-daily-{stream}'
 
     # Job template for daily builders
     #
diff --git a/jjb/genesis/genesis.yml b/jjb/genesis/genesis.yml
index e70442ddd..108ea5d41 100644
--- a/jjb/genesis/genesis.yml
+++ b/jjb/genesis/genesis.yml
@@ -11,7 +11,7 @@
     jobs:
         - 'genesis-{installer}-verify'
         - 'genesis-{installer}-merge'
-        - 'genesis-{installer}-daily-master'
+        - 'genesis-{installer}-daily-{stream}'
         - 'genesis-build-docs'
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -150,7 +150,7 @@
         - '{installer}-merge'
 
 - job-template:
-    name: 'genesis-{installer}-daily-master'
+    name: 'genesis-{installer}-daily-{stream}'
 
     project-type: freestyle
 
diff --git a/jjb/ipv6/ipv6.yml b/jjb/ipv6/ipv6.yml
index d6f5027fe..5957a93bf 100644
--- a/jjb/ipv6/ipv6.yml
+++ b/jjb/ipv6/ipv6.yml
@@ -2,7 +2,7 @@
     name: ipv6
     jobs:
         - 'ipv6-test'
-        - 'ipv6-daily-master'
+        - 'ipv6-daily-{stream}'
         - 'ipv6-merge'
         - 'ipv6-verify'
 
@@ -31,7 +31,7 @@
             echo "Hello world from ipv6"
 
 - job-template:
-    name: 'ipv6-daily-master'
+    name: 'ipv6-daily-{stream}'
 
     # Job template for daily builders
     #
diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index 9acf1e627..b0657de9f 100644
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -2,7 +2,7 @@
     name: octopus
     jobs:
         - 'octopus-test'
-        - 'octopus-daily-master'
+        - 'octopus-daily-{stream}'
         - 'octopus-merge'
         - 'octopus-verify'
 
@@ -31,7 +31,7 @@
             echo "Hello world from octopus"
 
 - job-template:
-    name: 'octopus-daily-master'
+    name: 'octopus-daily-{stream}'
 
     # Job template for daily builders
     #
diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 327747f7f..949b245f4 100644
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -2,7 +2,7 @@
     name: opnfvdocs
     jobs:
         - 'opnfvdocs-test'
-        - 'opnfvdocs-daily-master'
+        - 'opnfvdocs-daily-{stream}'
         - 'opnfvdocs-merge'
         - 'opnfvdocs-verify'
         - 'opnfvdocs-build-docs'
@@ -32,7 +32,7 @@
             echo "Hello world from opnfvdocs"
 
 - job-template:
-    name: 'opnfvdocs-daily-master'
+    name: 'opnfvdocs-daily-{stream}'
 
     # Job template for daily builders
     #
diff --git a/jjb/oscar/oscar.yml b/jjb/oscar/oscar.yml
index 7a6d3704b..6585feb50 100644
--- a/jjb/oscar/oscar.yml
+++ b/jjb/oscar/oscar.yml
@@ -2,7 +2,7 @@
     name: oscar
     jobs:
         - 'oscar-test'
-        - 'oscar-daily-master'
+        - 'oscar-daily-{stream}'
         - 'oscar-merge'
         - 'oscar-verify'
 
@@ -31,7 +31,7 @@
             echo "Hello world from oscar"
 
 - job-template:
-    name: 'oscar-daily-master'
+    name: 'oscar-daily-{stream}'
 
     # Job template for daily builders
     #
diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml
index 07d3612c1..88c32a6a6 100644
--- a/jjb/parser/parser.yml
+++ b/jjb/parser/parser.yml
@@ -2,7 +2,7 @@
     name: parser
     jobs:
         - 'parser-test'
-        - 'parser-daily-master'
+        - 'parser-daily-{stream}'
         - 'parser-merge'
         - 'parser-verify'
 
@@ -31,7 +31,7 @@
             echo "Hello world from parser"
 
 - job-template:
-    name: 'parser-daily-master'
+    name: 'parser-daily-{stream}'
 
     # Job template for daily builders
     #
diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml
index 690b7f338..a585d03e3 100644
--- a/jjb/pharos/pharos.yml
+++ b/jjb/pharos/pharos.yml
@@ -2,7 +2,7 @@
     name: pharos
     jobs:
         - 'pharos-test'
-        - 'pharos-daily-master'
+        - 'pharos-daily-{stream}'
         - 'pharos-merge'
         - 'pharos-verify'
         - 'pharos-build-docs'
@@ -32,7 +32,7 @@
             echo "Hello world from pharos"
 
 - job-template:
-    name: 'pharos-daily-master'
+    name: 'pharos-daily-{stream}'
 
     # Job template for daily builders
     #
diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml
index e87be1cb6..e8e5876eb 100644
--- a/jjb/prediction/prediction.yml
+++ b/jjb/prediction/prediction.yml
@@ -2,7 +2,7 @@
     name: prediction
     jobs:
         - 'prediction-test'
-        - 'prediction-daily-master'
+        - 'prediction-daily-{stream}'
         - 'prediction-merge'
         - 'prediction-verify'
 
@@ -31,7 +31,7 @@
             echo "Hello world from prediction"
 
 - job-template:
-    name: 'prediction-daily-master'
+    name: 'prediction-daily-{stream}'
 
     # Job template for daily builders
     #
diff --git a/jjb/promise/promise.yml b/jjb/promise/promise.yml
index 8238095a6..b4766976e 100644
--- a/jjb/promise/promise.yml
+++ b/jjb/promise/promise.yml
@@ -2,7 +2,7 @@
     name: promise
     jobs:
         - 'promise-test'
-        - 'promise-daily-master'
+        - 'promise-daily-{stream}'
         - 'promise-merge'
         - 'promise-verify'
 
@@ -31,7 +31,7 @@
             echo "Hello world from promise"
 
 - job-template:
-    name: 'promise-daily-master'
+    name: 'promise-daily-{stream}'
 
     # Job template for daily builders
     #
diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml
index 2bf125bc6..ab6dcc49e 100644
--- a/jjb/qtip/qtip.yml
+++ b/jjb/qtip/qtip.yml
@@ -2,7 +2,7 @@
     name: qtip
     jobs:
         - 'qtip-test'
-        - 'qtip-daily-master'
+        - 'qtip-daily-{stream}'
         - 'qtip-merge'
         - 'qtip-verify'
 
@@ -31,7 +31,7 @@
             echo "Hello world from qtip"
 
 - job-template:
-    name: 'qtip-daily-master'
+    name: 'qtip-daily-{stream}'
 
     # Job template for daily builders
     #
diff --git a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
index fb0da01af..67c9ebb23 100644
--- a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
+++ b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
@@ -2,7 +2,7 @@
     name: vnf_forwarding_graph
     jobs:
         - 'vnf_forwarding_graph-test'
-        - 'vnf_forwarding_graph-daily-master'
+        - 'vnf_forwarding_graph-daily-{stream}'
         - 'vnf_forwarding_graph-merge'
         - 'vnf_forwarding_graph-verify'
 
@@ -31,7 +31,7 @@
             echo "Hello world from vnf_forwarding_graph"
 
 - job-template:
-    name: 'vnf_forwarding_graph-daily-master'
+    name: 'vnf_forwarding_graph-daily-{stream}'
 
     # Job template for daily builders
     #
diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index 7c71fbc07..192737be2 100644
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -2,7 +2,7 @@
     name: vswitchperf
     jobs:
         - 'vswitchperf-test'
-        - 'vswitchperf-daily-master'
+        - 'vswitchperf-daily-{stream}'
         - 'vswitchperf-merge'
         - 'vswitchperf-verify'
 
@@ -31,7 +31,7 @@
             echo "Hello world from vswitchperf"
 
 - job-template:
-    name: 'vswitchperf-daily-master'
+    name: 'vswitchperf-daily-{stream}'
 
     # Job template for daily builders
     #