clean scm defenitions

[releng.git] / jjb / conductor / conductor.yml

diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml
index 961bcd8..f997880 100644 (file)
--- a/jjb/conductor/conductor.yml
+++ b/jjb/conductor/conductor.yml
@@ -10,40 +10,34 @@
     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
+        - colorado:
+            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}'
+        - gerrit-parameter:
+            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 +53,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'