Merge "Add builds for Clover controller, collector, jmeter"

[releng.git] / jjb / releng / opnfv-docker.yaml

diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 895dcc2..5b93b0f 100644 (file)
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -23,6 +23,10 @@
       stream: fraser
       branch: 'stable/{stream}'
       disabled: false
+    gambia: &gambia
+      stream: gambia
+      branch: 'stable/{stream}'
+      disabled: false
     pharos-tools-receivers: &pharos_tools_receivers
       receivers: >
           pberberian@iol.unh.edu
@@ -170,17 +174,14 @@
           <<: *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':
@@ -311,8 +312,8 @@
           <<: *storperf-receivers
       - 'yardstick':
           project: 'yardstick'
-          <<: *fraser
-          <<: *other-receivers
+          <<: *gambia
+          <<: *yardstick-receivers
       # projects with jobs for fraser
       - 'bottlenecks':
           project: 'bottlenecks'