X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng%2Fopnfv-docker.yaml;h=591452a74de5f67bf10e023bc0379db22efdedc0;hb=55016b8d48ff3871dc08bf41224b9986da3b5723;hp=da2916fe17fd287e1377cd7c1f5402cbd7b412cd;hpb=c0c28db9493e0a01edb2050a3ce6ce72d6636071;p=releng.git

diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index da2916fe1..591452a74 100644
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -61,6 +61,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'
@@ -258,6 +264,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'
@@ -265,39 +276,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'
@@ -313,31 +335,31 @@
           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'
@@ -399,9 +421,6 @@
       - 'daisy':
           dockerrepo: 'daisy'
           <<: *master
-      - 'escalator':
-          dockerrepo: 'escalator'
-          <<: *master
 
     jobs:
       - '{project}-docker-build-push-monitor-{stream}'