X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng%2Fopnfv-docker.yml;h=f69992156e5d1f0c01d29743d44fc83f1e9d2752;hb=5a681846dd3c0ef0dd290384bbbcfe678683d923;hp=4813a8877a6518784652642921859de6c96d0568;hpb=fbccf94bda7852f86ea5bb417c8271b6ffb2ff85;p=releng.git

diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 4813a8877..f69992156 100644
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -10,36 +10,55 @@
         stream: master
         branch: '{stream}'
         disabled: false
-    colorado: &colorado
-        stream: colorado
+    danube: &danube
+        stream: danube
         branch: 'stable/{stream}'
         disabled: false
+    functest-receivers: &functest-receivers
+        receivers: >
+            jose.lausuch@ericsson.com morgan.richomme@orange.com
+            cedric.ollivier@orange.com feng.xiaowei@zte.com.cn
+            yaohelan@huawei.com helanyao@gmail.com
+            juha.kosonen@nokia.com
+    other-receivers: &other-receivers
+        receivers: ''
 
     project:
         # projects with jobs for master
         - 'bottlenecks':
             <<: *master
+            <<: *other-receivers
         - 'cperf':
             <<: *master
+            <<: *other-receivers
         - 'dovetail':
             <<: *master
+            <<: *other-receivers
         - 'functest':
             <<: *master
+            <<: *functest-receivers
         - 'qtip':
             <<: *master
+            <<: *other-receivers
         - 'storperf':
             <<: *master
+            <<: *other-receivers
         - 'yardstick':
             <<: *master
+            <<: *other-receivers
         # projects with jobs for stable
         - 'bottlenecks':
-            <<: *colorado
+            <<: *danube
+            <<: *other-receivers
         - 'functest':
-            <<: *colorado
+            <<: *danube
+            <<: *functest-receivers
         - 'storperf':
-            <<: *colorado
+            <<: *danube
+            <<: *other-receivers
         - 'yardstick':
-            <<: *colorado
+            <<: *danube
+            <<: *other-receivers
 
     jobs:
         - '{project}-docker-build-push-{stream}'
@@ -53,6 +72,8 @@
         # projects with jobs for master
         - 'daisy':
             <<: *master
+        - 'escalator':
+            <<: *master
 
     jobs:
         - '{project}-docker-build-push-monitor-{stream}'
@@ -68,6 +89,7 @@
     parameters: &parameters
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
         - string:
             name: PUSH_IMAGE
@@ -81,12 +103,13 @@
             name: RELEASE_VERSION
             default: ""
             description: "Release version, e.g. 1.0, 2.0, 3.0"
+        - string:
+            name: DOCKERFILE
+            default: "Dockerfile"
+            description: "Dockerfile to use for creating the image."
 
-    scm: &scm
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+    scm:
+        - git-scm
 
     builders: &builders
         - shell:
@@ -96,11 +119,16 @@
         - pollscm:
             cron: "*/30 * * * *"
 
+    publishers:
+        - email:
+            recipients: '{receivers}'
+
 - job-template:
     name: '{project}-docker-build-push-monitor-{stream}'
     disabled: '{obj:disabled}'
     parameters: *parameters
-    scm: *scm
+    scm:
+        - git-scm
     builders: *builders
 
     # trigger only matching the file name