X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng%2Fopnfv-docker.yml;h=87b03626efe9f8e0cc7678c33578d1cd90aac29a;hb=aa51cedd14432be1bc9a9f6e97ca2abc077ba23f;hp=0df0ddf6fcec6934c35e44394f19c09b4efeaf53;hpb=7471fc66629d6f138099ec7e2ea5ebf9a68a6289;p=releng.git

diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 0df0ddf6f..87b03626e 100644
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -10,41 +10,72 @@
         stream: master
         branch: '{stream}'
         disabled: false
-    colorado: &colorado
-        stream: colorado
+    danube: &danube
+        stream: danube
         branch: 'stable/{stream}'
-        disabled: false
+        disabled: true
+    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}'
 
 
+- project:
+
+    name: opnfv-monitor-docker        # projects which only monitor dedicated file or path
+
+    project:
+        # projects with jobs for master
+        - 'daisy':
+            <<: *master
+
+    jobs:
+        - '{project}-docker-build-push-monitor-{stream}'
+
 ########################
 # job templates
 ########################
@@ -53,9 +84,11 @@
 
     disabled: '{obj:disabled}'
 
-    parameters:
+    parameters: &parameters
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
         - string:
             name: PUSH_IMAGE
@@ -65,14 +98,15 @@
             name: DOCKER_REPO_NAME
             default: "opnfv/{project}"
             description: "Dockerhub repo to be pushed to."
+        - string:
+            name: RELEASE_VERSION
+            default: ""
+            description: "Release version, e.g. 1.0, 2.0, 3.0"
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
-    builders:
+    builders: &builders
         - shell:
             !include-raw-escape: ./opnfv-docker.sh
 
@@ -80,3 +114,32 @@
         - pollscm:
             cron: "*/30 * * * *"
 
+    publishers:
+        - email:
+            recipients: '{receivers}'
+
+- job-template:
+    name: '{project}-docker-build-push-monitor-{stream}'
+    disabled: '{obj:disabled}'
+    parameters: *parameters
+    scm:
+        - git-scm
+    builders: *builders
+
+    # trigger only matching the file name
+    triggers:
+        - gerrit:
+            trigger-on:
+                - change-merged-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'remerge'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{project}'
+                branches:
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: 'docker/**'
+