X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfv%2Fopnfv-docker.yml;h=f313b3b92323075dfafa0dc75aadb235670d7333;hb=5b2d789e947d9ba2ea36cbcbf7e4a615698619cd;hp=6b49242952dc655d60e396cbd210ca8ca9ad58bb;hpb=ee593aa4a43aa7ecd2c92f62f2ae3b120d0492b9;p=releng.git

diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/opnfv/opnfv-docker.yml
index 6b4924295..f313b3b92 100644
--- a/jjb/opnfv/opnfv-docker.yml
+++ b/jjb/opnfv/opnfv-docker.yml
@@ -16,12 +16,21 @@
     jobs:
         - '{project}-docker-build-push-{stream}'
         - 'yardstick-docker-build-push-{stream}'
+        #dovetail not sync with release, an independent job
+        #only master by now, will adjust accordingly in future
+        - 'dovetail-docker-build-push-{dovetailstream}'
 
     stream:
         - master:
             branch: '{stream}'
-        - brahmaputra:
+            disabled: false
+        - colorado:
             branch: 'stable/{stream}'
+            disabled: false
+    dovetailstream:
+        - master:
+            branch: '{dovetailstream}'
+            disabled: false
 
 ########################
 # job templates
@@ -29,19 +38,19 @@
 - job-template:
     name: '{project}-docker-build-push-{stream}'
 
-    disabled: false
+    disabled: '{obj:disabled}'
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - string:
             name: PUSH_IMAGE
             default: "true"
             description: "To enable/disable pushing the image to Dockerhub."
         - string:
             name: BASE_VERSION
-            default: "brahmaputra.3"
+            default: "colorado.0"
             description: "Base version to be used."
         - string:
             name: DOCKER_REPO_NAME
@@ -72,19 +81,19 @@
 - job-template:
     name: 'yardstick-docker-build-push-{stream}'
 
-    disabled: false
+    disabled: '{obj:disabled}'
 
     parameters:
         - project-parameter:
             project: 'yardstick'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - string:
             name: PUSH_IMAGE
             default: "true"
             description: "To enable/disable pushing the image to Dockerhub."
         - string:
             name: BASE_VERSION
-            default: "brahmaputra.3"
+            default: "colorado.0"
             description: "Base version to be used."
         - string:
             name: DOCKER_REPO_NAME
@@ -111,3 +120,50 @@
     triggers:
         - pollscm:
             cron: "*/30 * * * *"
+
+- job-template:
+    name: 'dovetail-docker-build-push-{dovetailstream}'
+
+    disabled: '{obj:disabled}'
+
+    parameters:
+        - project-parameter:
+            project: 'dovetail'
+        - 'opnfv-build-ubuntu-defaults'
+        - string:
+            name: PUSH_IMAGE
+            default: "true"
+            description: "To enable/disable pushing the image to Dockerhub."
+        #BASE_VERSION parameter is used for version control
+        #by now, only master branch is used, this parameter takes no effect
+        #once branch control settled, should be adjusted togather with
+        #opnfv-docker.sh and caculate_version.sh
+        - string:
+            name: BASE_VERSION
+            default: "1.0"
+            description: "Base version to be used."
+        - string:
+            name: DOCKER_REPO_NAME
+            default: "opnfv/dovetail"
+            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:
+            cron: "*/30 * * * *"