Enable verify and merge jobs for stable/brahmaputra branch

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

diff --git a/jjb/copper/copper.yml b/jjb/copper/copper.yml
index 654b6f0..1b16864 100644 (file)
--- a/jjb/copper/copper.yml
+++ b/jjb/copper/copper.yml
@@ -10,30 +10,22 @@
     jobs:
         - 'copper-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: &copper_job_defaults
-    name: copper_job_defaults
+- job-template:
+    name: 'copper-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
-
-- job-template:
-    name: 'copper-verify-{stream}'
-
-    <<: *copper_job_defaults
-
-    parameters:
+            branch: '{branch}'
         - 'opnfv-build-defaults'
 
     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'