fuel: Fix sfc expect script to make it work on Jenkins

[releng.git] / jjb / opnfv / opnfv-docker.yml

diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/opnfv/opnfv-docker.yml
index fcbe60b..04dcf83 100644 (file)
--- a/jjb/opnfv/opnfv-docker.yml
+++ b/jjb/opnfv/opnfv-docker.yml
@@ -17,7 +17,9 @@
 
     stream:
         - master:
-            branch: 'master'
+            branch: '{stream}'
+        - brahmaputra:
+            branch: 'stable/{stream}'
 
 ########################
 # job templates
@@ -25,17 +27,12 @@
 - job-template:
     name: '{project}-docker-build-push-{stream}'
 
-    node: ericsson-build
-
     disabled: false
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - string:
-            name: GIT_BASE
-            default: "https://gerrit.opnfv.org/gerrit/$PROJECT"
-            description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+        - 'ericsson-build-defaults'
         - string:
             name: PUSH_IMAGE
             default: "true"
@@ -64,7 +61,8 @@
 
     builders:
         - shell:
-            !include-raw ./opnfv-docker.sh
+            !include-raw-escape: ./opnfv-docker.sh
 
     triggers:
-        - pollscm: "*/30 * * * *"
+        - pollscm:
+            cron: "*/30 * * * *"