X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fopnfv%2Fopnfv-docker.yml;h=6c68acb4a8c2cd7de5019f41b02434a0e9defc82;hb=bf3f0a58b5ddf71a85eee8cf48088dde0292c784;hp=46a05230bf1c024aec64fdb537963821c7b7b908;hpb=05daeeb4f90eb5a8ab0a928bc7c9d6414b5c1905;p=releng.git

diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/opnfv/opnfv-docker.yml
index 46a05230b..6c68acb4a 100644
--- a/jjb/opnfv/opnfv-docker.yml
+++ b/jjb/opnfv/opnfv-docker.yml
@@ -8,14 +8,18 @@
 
     project:
         - 'functest'
-        - 'yardstick'
+        - 'storperf'
+        - 'qtip'
 
     jobs:
         - '{project}-docker-build-push-{stream}'
+        - 'yardstick-docker-build-push-{stream}'
 
     stream:
         - master:
-            branch: 'master'
+            branch: '{stream}'
+        - brahmaputra:
+            branch: 'stable/{stream}'
 
 ########################
 # job templates
@@ -23,24 +27,19 @@
 - 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"
             description: "To enable/disable pushing the image to Dockerhub."
         - string:
             name: BASE_VERSION
-            default: "brahmaputra.0"
+            default: "brahmaputra.1"
             description: "Base version to be used."
         - string:
             name: DOCKER_REPO_NAME
@@ -62,7 +61,51 @@
 
     builders:
         - shell:
-            !include-raw ./opnfv-docker.sh
+            !include-raw-escape: ./opnfv-docker.sh
+
+    triggers:
+        - pollscm:
+            cron: "*/30 * * * *"
+
+- job-template:
+    name: 'yardstick-docker-build-push-{stream}'
+
+    disabled: false
+
+    parameters:
+        - project-parameter:
+            project: 'yardstick'
+        - 'ericsson-build-defaults'
+        - string:
+            name: PUSH_IMAGE
+            default: "true"
+            description: "To enable/disable pushing the image to Dockerhub."
+        - string:
+            name: BASE_VERSION
+            default: "brahmaputra.2"
+            description: "Base version to be used."
+        - string:
+            name: DOCKER_REPO_NAME
+            default: "opnfv/yardstick"
+            description: "Dockerhub repo to be pushed to."
+        - string:
+            name: UPDATE_LATEST_STABLE
+            default: "false"
+            description: "This will update the latest_stable image only."
+        - string:
+            name: STABLE_TAG
+            description: "If above option is true, this is the tag to be pulled."
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    builders:
+        - shell:
+            !include-raw-escape: ./opnfv-docker.sh
 
     triggers:
-        - pollscm: "*/30 * * * *"
+        - pollscm:
+            cron: "*/30 * * * *"