X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng%2Fopnfv-docker.yaml;h=08c08ee8266b219e2ee136ea51701c2176db2ffc;hb=3663d726c3821e63d9f5cd4a4736a11680534199;hp=17235b37df82d985760b5dd66a9624d02d6e25f0;hpb=9261f361c1ce51a8425f928895d7379fd42754c4;p=releng.git

diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 17235b37d..08c08ee82 100644
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -27,6 +27,10 @@
       stream: gambia
       branch: 'stable/{stream}'
       disabled: false
+    hunter: &hunter
+      stream: hunter
+      branch: 'stable/{stream}'
+      disabled: false
     pharos-tools-receivers: &pharos_tools_receivers
       receivers: >
           pberberian@iol.unh.edu
@@ -36,15 +40,14 @@
           mark.beierl@emc.com
     yardstick-receivers: &yardstick-receivers
       receivers: >
-          limingjiang@huawei.com
           rexlee8776@gmail.com
-          emma.l.foley@intel.com
     other-receivers: &other-receivers
       receivers: ''
 
     dockerfile: "Dockerfile"
     dockerdir: "docker"
     arch_tag: ""
+    extra_build_args: ""
 
     # This is the dockerhub repo the image will be pushed to as
     # 'opnfv/{dockerrepo}. See: DOCKER_REPO_NAME parameter.
@@ -61,6 +64,12 @@
           dockerdir: 'docker/barometer-collectd'
           <<: *master
           <<: *other-receivers
+      - 'barometer-collectd-master':
+          project: 'barometer'
+          dockerdir: '.'
+          dockerfile: 'docker/barometer-collectd-master/Dockerfile'
+          <<: *master
+          <<: *other-receivers
       - 'barometer-dma':
           project: 'barometer'
           dockerdir: 'docker/barometer-dma'
@@ -197,6 +206,12 @@
           dockerfile: 'Dockerfile.web'
           <<: *master
           <<: *other-receivers
+      - 'dovetail-webportal-web-onap':
+          project: 'dovetail-webportal'
+          dockerfile: 'Dockerfile.web'
+          extra_build_args: 'CONTAINER=onap GUI=onap-ui'
+          <<: *master
+          <<: *other-receivers
       - 'nfvbench':
           project: 'nfvbench'
           <<: *master
@@ -258,6 +273,11 @@
           project: 'yardstick'
           <<: *master
           <<: *yardstick-receivers
+      - 'yardstick-ubuntu-18.04':
+          project: 'yardstick'
+          dockerfile: 'Dockerfile_ubuntu18'
+          <<: *master
+          <<: *yardstick-receivers
       - 'yardstick-image-k8s':
           project: 'yardstick'
           dockerdir: 'docker/k8s'
@@ -275,6 +295,12 @@
           dockerdir: 'docker/barometer-collectd'
           <<: *gambia
           <<: *other-receivers
+      - 'barometer-collectd-master':
+          project: 'barometer'
+          dockerdir: '.'
+          dockerfile: 'docker/barometer-collectd-master/Dockerfile'
+          <<: *gambia
+          <<: *other-receivers
       - 'barometer-grafana':
           project: 'barometer'
           dockerdir: 'docker/barometer-grafana'
@@ -302,7 +328,7 @@
           <<: *other-receivers
       - 'bottlenecks':
           project: 'bottlenecks'
-          <<: *euphrates
+          <<: *gambia
           <<: *other-receivers
       - 'nfvbench':
           project: 'nfvbench'
@@ -346,12 +372,12 @@
           <<: *storperf-receivers
       - 'yardstick':
           project: 'yardstick'
-          <<: *gambia
+          <<: *hunter
           <<: *yardstick-receivers
       # projects with jobs for fraser
       - 'bottlenecks':
           project: 'bottlenecks'
-          <<: *fraser
+          <<: *hunter
           <<: *other-receivers
       - 'clover':
           project: 'clover'
@@ -398,15 +424,13 @@
     dockerfile: "Dockerfile"
     dockerdir: "docker"
     arch_tag: ""
+    extra_build_args: ""
 
     project:
       # projects with jobs for master
       - 'daisy':
           dockerrepo: 'daisy'
           <<: *master
-      - 'escalator':
-          dockerrepo: 'escalator'
-          <<: *master
 
     jobs:
       - '{project}-docker-build-push-monitor-{stream}'
@@ -452,6 +476,10 @@
           name: ARCH_TAG
           default: "{arch_tag}"
           description: "If set, this value will be added to the docker image tag as a prefix"
+      - string:
+          name: EXTRA_BUILD_ARGS
+          default: "{extra_build_args}"
+          description: "Whitespace separated key=value pairs. If set, these args will be used to build docker image"
 
     properties:
       - throttle: