X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng%2Fopnfv-docker.yml;h=d0c2b26758c153093fb66b0bc4afdf8f1fbae4f6;hb=83a7a4ac9d2966010eac2b6ce5af2904276e55c8;hp=f0020aea3e8ec16021b54e2bdec77a03a7dc9ce4;hpb=dc304463a3b26edb4abf24cb7292750400c42466;p=releng.git

diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index f0020aea3..d0c2b2675 100644
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -19,11 +19,6 @@
       stream: euphrates
       branch: 'stable/{stream}'
       disabled: false
-    functest-receivers: &functest-receivers
-      receivers: >
-          jalausuch@suse.com morgan.richomme@orange.com
-          cedric.ollivier@orange.com feng.xiaowei@zte.com.cn
-          juha.kosonen@nokia.com wangwulin@huawei.com
     storperf-receivers: &storperf-receivers
       receivers: >
           mark.beierl@emc.com
@@ -44,6 +39,36 @@
           project: 'releng-anteater'
           <<: *master
           <<: *other-receivers
+      - 'barometer-collectd':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-collectd'
+          <<: *master
+          <<: *other-receivers
+      - 'barometer-grafana':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-grafana'
+          <<: *master
+          <<: *other-receivers
+      - 'barometer-influxdb':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-influxdb'
+          <<: *master
+          <<: *other-receivers
+      - 'barometer-kafka':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-kafka'
+          <<: *master
+          <<: *other-receivers
+      - 'barometer-ves':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-ves'
+          <<: *master
+          <<: *other-receivers
+      - 'barometer-snmp':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-snmp'
+          <<: *master
+          <<: *other-receivers
       - 'bottlenecks':
           project: 'bottlenecks'
           <<: *master
@@ -56,16 +81,14 @@
           project: 'dovetail'
           <<: *master
           <<: *other-receivers
-      - 'functest':
-          project: 'functest'
-          <<: *master
-          <<: *functest-receivers
       - 'nfvbench':
           project: 'nfvbench'
           <<: *master
           <<: *other-receivers
       - 'qtip':
           project: 'qtip'
+          dockerdir: '.'
+          dockerfile: 'docker/Dockerfile.local'
           <<: *master
           <<: *other-receivers
       - 'storperf-master':
@@ -102,24 +125,23 @@
           project: 'yardstick'
           <<: *master
           <<: *other-receivers
-      # projects with jobs for Danube
-      - 'qtip':
-          project: 'qtip'
-          <<: *euphrates
-          <<: *other-receivers
-      - 'yardstick':
-          project: 'yardstick'
-          <<: *euphrates
+      - 'functest-kubernetes':
+          project: 'functest-kubernetes'
+          <<: *master
           <<: *other-receivers
       # projects with jobs for euphrates
       - 'bottlenecks':
           project: 'bottlenecks'
           <<: *euphrates
           <<: *other-receivers
-      - 'functest':
-          project: 'functest'
+      - 'nfvbench':
+          project: 'nfvbench'
+          <<: *euphrates
+          <<: *other-receivers
+      - 'qtip':
+          project: 'qtip'
           <<: *euphrates
-          <<: *functest-receivers
+          <<: *other-receivers
       - 'storperf-master':
           project: 'storperf'
           dockerdir: 'docker/storperf-master'
@@ -150,10 +172,19 @@
           arch_tag: 'x86_64'
           <<: *euphrates
           <<: *storperf-receivers
-      - 'nfvbench':
-          project: 'nfvbench'
+      - 'yardstick':
+          project: 'yardstick'
           <<: *euphrates
           <<: *other-receivers
+      - 'xtesting':
+          project: 'functest-xtesting'
+          <<: *master
+          <<: *other-receivers
+      # projects with jobs for danube
+      - 'dovetail':
+          project: 'dovetail'
+          <<: *danube
+          <<: *other-receivers
 
     # yamllint enable rule:key-duplicates
     jobs:
@@ -209,9 +240,9 @@
           default: ""
           description: "commit id to make a snapshot docker image"
       - string:
-          name: RELEASE_VERSION
+          name: GERRIT_REFNAME
           default: ""
-          description: "Release version, e.g. 1.0, 2.0, 3.0"
+          description: "Docker tag to be built, e.g. refs/tags/5.0.0, refs/tags/opnfv-5.0.0, refs/tags/5.0.RC1"
       - string:
           name: DOCKERFILE
           default: "{dockerfile}"
@@ -236,6 +267,8 @@
     triggers:
       - pollscm:
           cron: "*/30 * * * *"
+      - gerrit-trigger-tag-created:
+          project: '{project}'
 
     publishers:
       - email: