X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fconductor%2Fconductor.yml;h=247f4f26859603d668c0990ba722b38c9a411179;hb=a3258aa1164f76b4e8089ae254916451c4b456b7;hp=961bcd878fee101a2d7a48831eb6b3ffe2c3dd78;hpb=4163f6bfb811c17dc22e68c7a2ef1ed30293feaf;p=releng.git

diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml
index 961bcd878..247f4f268 100644
--- a/jjb/conductor/conductor.yml
+++ b/jjb/conductor/conductor.yml
@@ -10,31 +10,23 @@
     jobs:
         - 'conductor-verify-{stream}'
 
-# only master branch is enabled at the moment to keep no of jobs sane
     stream:
         - master:
-            branch: 'master'
+            branch: '{stream}'
             gs-pathname: ''
-#        - stable-brahmaputra:
-#            branch: 'stable/brahmaputra'
-#            gs-pathname: '/brahmaputra'
+        - brahmaputra:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
 
-- job_defaults: &conductor_job_defaults
-    name: conductor_job_defaults
+- job-template:
+    name: 'conductor-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
-
-- job-template:
-    name: 'conductor-verify-{stream}'
-
-    <<: *conductor_job_defaults
-
-    parameters:
-        - 'opnfv-build-defaults'
+            branch: '{branch}'
+        - 'opnfv-build-ubuntu-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -59,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'