X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Foscar%2Foscar.yml;h=786d44b3eda680ba9bd1021ce733f0feefa3086f;hb=b2628f46a2abe65c8aea4e8c527148ab5bfa3ba0;hp=380c901971aeada844909ee3725c257af3f2a0e3;hpb=4163f6bfb811c17dc22e68c7a2ef1ed30293feaf;p=releng.git

diff --git a/jjb/oscar/oscar.yml b/jjb/oscar/oscar.yml
index 380c90197..786d44b3e 100644
--- a/jjb/oscar/oscar.yml
+++ b/jjb/oscar/oscar.yml
@@ -15,25 +15,18 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-#        - stable-brahmaputra:
+#        - brahmaputra:
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
-- job_defaults: &oscar_job_defaults
-    name: oscar_job_defaults
+- job-template:
+    name: 'oscar-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: '{stream}'
-
-- job-template:
-    name: 'oscar-verify-{stream}'
-
-    <<: *oscar_job_defaults
-
-    parameters:
+            branch: '{branch}'
         - 'opnfv-build-defaults'
 
     scm:
@@ -59,7 +52,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{stream}'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'