Fix branch parameter and change stream name to brahmaputra

Change-Id: I9005cb7cee44873b37fb310e5850d85d887c958d
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

diff --git a/jjb/armband/armband.yml b/jjb/armband/armband.yml
index 1ffc8ac..c35f287 100644 (file)
--- a/jjb/armband/armband.yml
+++ b/jjb/armband/armband.yml
@@ -15,7 +15,7 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
@@ -26,7 +26,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
+            branch: '{branch}'
         - 'opnfv-build-defaults'
 
     scm:
@@ -52,7 +52,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'

diff --git a/jjb/availability/availability.yml b/jjb/availability/availability.yml
index 763a43c..2f0812b 100644 (file)
--- a/jjb/availability/availability.yml
+++ b/jjb/availability/availability.yml
@@ -15,7 +15,7 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
@@ -26,7 +26,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
+            branch: '{branch}'
         - 'opnfv-build-defaults'
 
     scm:
@@ -52,7 +52,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'

diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml
index 15aceef..e961478 100644 (file)
--- a/jjb/bottlenecks/bottlenecks.yml
+++ b/jjb/bottlenecks/bottlenecks.yml
@@ -21,7 +21,7 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
@@ -36,7 +36,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
+            branch: '{branch}'
         - 'opnfv-build-defaults'
 
     scm:
@@ -62,7 +62,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'

diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 1265bf0..4040201 100644 (file)
--- a/jjb/compass4nfv/compass4nfv.yml
+++ b/jjb/compass4nfv/compass4nfv.yml
@@ -17,7 +17,7 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 

diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml
index 5acfef3..39325d4 100644 (file)
--- a/jjb/conductor/conductor.yml
+++ b/jjb/conductor/conductor.yml
@@ -15,7 +15,7 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
@@ -26,7 +26,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
+            branch: '{branch}'
         - 'opnfv-build-defaults'
 
     scm:
@@ -52,7 +52,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'

diff --git a/jjb/copper/copper.yml b/jjb/copper/copper.yml
index 5a1077f..fc27d9c 100644 (file)
--- a/jjb/copper/copper.yml
+++ b/jjb/copper/copper.yml
@@ -15,7 +15,7 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
@@ -26,7 +26,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
+            branch: '{branch}'
         - 'opnfv-build-defaults'
 
     scm:
@@ -52,7 +52,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 86f0fad..b2fba98 100644 (file)
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -15,7 +15,7 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
@@ -26,7 +26,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
+            branch: '{branch}'
         - 'opnfv-build-defaults'
 
     scm:
@@ -52,7 +52,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'

diff --git a/jjb/dpacc/dpacc.yml b/jjb/dpacc/dpacc.yml
index ead48fb..d503257 100644 (file)
--- a/jjb/dpacc/dpacc.yml
+++ b/jjb/dpacc/dpacc.yml
@@ -15,7 +15,7 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
@@ -26,7 +26,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
+            branch: '{branch}'
         - 'opnfv-build-defaults'
 
     scm:
@@ -52,7 +52,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'

diff --git a/jjb/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml
index 5bac319..a0ae806 100644 (file)
--- a/jjb/fastpathmetrics/fastpathmetrics.yml
+++ b/jjb/fastpathmetrics/fastpathmetrics.yml
@@ -15,7 +15,7 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
@@ -26,7 +26,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
+            branch: '{branch}'
         - 'opnfv-build-defaults'
 
     scm:
@@ -52,7 +52,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'

diff --git a/jjb/ipv6/ipv6.yml b/jjb/ipv6/ipv6.yml
index 47f4c82..7768f2d 100644 (file)
--- a/jjb/ipv6/ipv6.yml
+++ b/jjb/ipv6/ipv6.yml
@@ -15,7 +15,7 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
@@ -26,7 +26,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
+            branch: '{branch}'
         - 'opnfv-build-defaults'
 
     scm:
@@ -52,7 +52,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'

diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index 7e05900..3aa422b 100644 (file)
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -14,7 +14,7 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
@@ -25,7 +25,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
+            branch: '{branch}'
         - 'opnfv-build-defaults'
 
     scm:
@@ -51,7 +51,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'

diff --git a/jjb/oscar/oscar.yml b/jjb/oscar/oscar.yml
index 0295674..786d44b 100644 (file)
--- a/jjb/oscar/oscar.yml
+++ b/jjb/oscar/oscar.yml
@@ -15,7 +15,7 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
@@ -26,7 +26,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
+            branch: '{branch}'
         - 'opnfv-build-defaults'
 
     scm:
@@ -52,7 +52,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'

diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index 83bab98..00417eb 100644 (file)
--- a/jjb/ovsnfv/ovsnfv.yml
+++ b/jjb/ovsnfv/ovsnfv.yml
@@ -13,7 +13,7 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
@@ -24,7 +24,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
         - 'intel-us-build-2-defaults'
 
     scm:
@@ -47,10 +47,10 @@
                     comment-contains-value: 'reverify'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: 'ovsnfv'
+                project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
 
     builders:
         - shell: |
@@ -69,7 +69,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
         - 'intel-us-build-2-defaults'
 
     scm:
@@ -86,10 +86,10 @@
                     comment-contains-value: 'remerge'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: 'ovsnfv'
+                project-pattern: '{project}'
                 branches:
                     - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+                      branch-pattern: '**/{branch}'
 
     builders:
         - shell: |

diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml
index 663ea2d..9913c03 100644 (file)
--- a/jjb/parser/parser.yml
+++ b/jjb/parser/parser.yml
@@ -15,7 +15,7 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
@@ -26,7 +26,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
+            branch: '{branch}'
         - 'opnfv-build-defaults'
 
     scm:
@@ -52,7 +52,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'

diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml
index 011a28a..30172cd 100644 (file)
--- a/jjb/pharos/pharos.yml
+++ b/jjb/pharos/pharos.yml
@@ -15,7 +15,7 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
@@ -26,7 +26,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
+            branch: '{branch}'
         - 'opnfv-build-defaults'
 
     scm:
@@ -52,7 +52,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'

diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml
index 4566f87..7a47bc1 100644 (file)
--- a/jjb/prediction/prediction.yml
+++ b/jjb/prediction/prediction.yml
@@ -15,7 +15,7 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
@@ -26,7 +26,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
+            branch: '{branch}'
         - 'opnfv-build-defaults'
 
     scm:
@@ -52,7 +52,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'

diff --git a/jjb/promise/promise.yml b/jjb/promise/promise.yml
index 21e5b66..d057f3f 100644 (file)
--- a/jjb/promise/promise.yml
+++ b/jjb/promise/promise.yml
@@ -15,7 +15,7 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
@@ -26,7 +26,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
+            branch: '{branch}'
         - 'opnfv-build-defaults'
 
     scm:
@@ -52,7 +52,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'

diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml
index 9388f38..fac9c33 100644 (file)
--- a/jjb/qtip/qtip.yml
+++ b/jjb/qtip/qtip.yml
@@ -19,7 +19,7 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
@@ -30,7 +30,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
+            branch: '{branch}'
         - 'opnfv-build-defaults'
 
     scm:
@@ -56,7 +56,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'