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

diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml
index 961bcd878..d2ce649fc 100644
--- a/jjb/conductor/conductor.yml
+++ b/jjb/conductor/conductor.yml
@@ -10,40 +10,33 @@
     jobs:
         - 'conductor-verify-{stream}'
 
-# only master branch is enabled at the moment to keep no of jobs sane
     stream:
         - master:
-            branch: 'master'
-            gs-pathname: ''
-#        - stable-brahmaputra:
-#            branch: 'stable/brahmaputra'
-#            gs-pathname: '/brahmaputra'
-
-- job_defaults: &conductor_job_defaults
-    name: conductor_job_defaults
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
             branch: '{stream}'
+            gs-pathname: ''
+            disabled: false
+        - danube:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
+            disabled: false
 
 - job-template:
     name: 'conductor-verify-{stream}'
 
-    <<: *conductor_job_defaults
+    disabled: '{obj:disabled}'
 
     parameters:
-        - 'opnfv-build-defaults'
+        - project-parameter:
+            project: '{project}'
+            branch: '{branch}'
+        - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -59,7 +52,8 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
+                disable-strict-forbidden-file-verification: 'true'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'