Tie all verify/merge/build to opnfv-build-ubuntu

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

diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index d61fa10..1cb71cc 100644 (file)
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -9,31 +9,23 @@
     jobs:
         - 'octopus-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: &octopus_job_defaults
-    name: octopus_job_defaults
+- job-template:
+    name: 'octopus-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
-
-- job-template:
-    name: 'octopus-verify-{stream}'
-
-    <<: *octopus_job_defaults
-
-    parameters:
-        - 'opnfv-build-defaults'
+            branch: '{branch}'
+        - 'opnfv-build-ubuntu-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -58,7 +50,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'