X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng%2Fopnfv-docker.yaml;h=08c08ee8266b219e2ee136ea51701c2176db2ffc;hb=3c389f82e545f8db73965eeb5f03d5077aff8c2e;hp=895dcc27456d52fb79ee2c70908cfc8bd96a3f92;hpb=de6cc7757c435f33a931a690aa950f635f7079c2;p=releng.git

diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 895dcc274..08c08ee82 100644
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -23,6 +23,14 @@
       stream: fraser
       branch: 'stable/{stream}'
       disabled: false
+    gambia: &gambia
+      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
@@ -32,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.
@@ -57,6 +64,17 @@
           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'
+          <<: *master
+          <<: *other-receivers
       - 'barometer-grafana':
           project: 'barometer'
           dockerdir: 'docker/barometer-grafana'
@@ -146,6 +164,30 @@
           dockerfile: 'Dockerfile'
           <<: *master
           <<: *other-receivers
+      - 'clover-ns-modsecurity-crs':
+          project: 'clover'
+          dockerdir: 'samples/services/modsecurity/docker'
+          dockerfile: 'Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-spark':
+          project: 'clover'
+          dockerdir: 'clover/spark/docker/clover-spark'
+          dockerfile: 'Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-spark-submit':
+          project: 'clover'
+          dockerdir: 'clover/spark/docker/spark-submit'
+          dockerfile: 'Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-clovisor':
+          project: 'clover'
+          dockerdir: 'clover/clovisor'
+          dockerfile: 'Dockerfile'
+          <<: *master
+          <<: *other-receivers
       - 'cperf':
           project: 'cperf'
           <<: *master
@@ -164,23 +206,26 @@
           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
           <<: *other-receivers
       - 'pharos-tools-laas-dashboard':
           project: 'pharos-tools'
-          dockerdir: 'dashboard/web'
-          <<: *master
-          <<: *pharos_tools_receivers
-      - 'pharos-tools-laas-mq':
-          project: 'pharos-tools'
-          dockerdir: 'dashboard/rabbitmq'
+          dockerdir: 'dashboard'
+          dockerfile: 'web/Dockerfile'
           <<: *master
           <<: *pharos_tools_receivers
       - 'pharos-tools-laas-celery':
           project: 'pharos-tools'
-          dockerdir: 'dashboard/worker'
+          dockerdir: 'dashboard'
+          dockerfile: 'worker/Dockerfile'
           <<: *master
           <<: *pharos_tools_receivers
       - 'qtip':
@@ -228,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'
@@ -235,39 +285,50 @@
           <<: *yardstick-receivers
 
       # projects with jobs for euphrates
+      - 'barometer-dma':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-dma'
+          <<: *gambia
+          <<: *other-receivers
       - 'barometer-collectd':
           project: 'barometer'
           dockerdir: 'docker/barometer-collectd'
-          <<: *fraser
+          <<: *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'
-          <<: *fraser
+          <<: *gambia
           <<: *other-receivers
       - 'barometer-influxdb':
           project: 'barometer'
           dockerdir: 'docker/barometer-influxdb'
-          <<: *fraser
+          <<: *gambia
           <<: *other-receivers
       - 'barometer-kafka':
           project: 'barometer'
           dockerdir: 'docker/barometer-kafka'
-          <<: *fraser
+          <<: *gambia
           <<: *other-receivers
       - 'barometer-ves':
           project: 'barometer'
           dockerdir: 'docker/barometer-ves'
-          <<: *fraser
+          <<: *gambia
           <<: *other-receivers
       - 'barometer-snmp':
           project: 'barometer'
           dockerdir: 'docker/barometer-snmp'
-          <<: *fraser
+          <<: *gambia
           <<: *other-receivers
       - 'bottlenecks':
           project: 'bottlenecks'
-          <<: *euphrates
+          <<: *gambia
           <<: *other-receivers
       - 'nfvbench':
           project: 'nfvbench'
@@ -283,40 +344,40 @@
           project: 'storperf'
           dockerdir: 'docker/storperf-master'
           arch_tag: 'x86_64'
-          <<: *fraser
+          <<: *gambia
           <<: *storperf-receivers
       - 'storperf-graphite':
           project: 'storperf'
           dockerdir: 'docker/storperf-graphite'
           arch_tag: 'x86_64'
-          <<: *fraser
+          <<: *gambia
           <<: *storperf-receivers
       - 'storperf-httpfrontend':
           project: 'storperf'
           dockerdir: 'docker/storperf-httpfrontend'
           arch_tag: 'x86_64'
-          <<: *fraser
+          <<: *gambia
           <<: *storperf-receivers
       - 'storperf-reporting':
           project: 'storperf'
           dockerdir: 'docker/storperf-reporting'
           arch_tag: 'x86_64'
-          <<: *fraser
+          <<: *gambia
           <<: *storperf-receivers
       - 'storperf-swaggerui':
           project: 'storperf'
           dockerdir: 'docker/storperf-swaggerui'
           arch_tag: 'x86_64'
-          <<: *fraser
+          <<: *gambia
           <<: *storperf-receivers
       - 'yardstick':
           project: 'yardstick'
-          <<: *fraser
-          <<: *other-receivers
+          <<: *hunter
+          <<: *yardstick-receivers
       # projects with jobs for fraser
       - 'bottlenecks':
           project: 'bottlenecks'
-          <<: *fraser
+          <<: *hunter
           <<: *other-receivers
       - 'clover':
           project: 'clover'
@@ -363,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}'
@@ -417,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: