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 41f3181..5b93b0f 100644 (file)
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -120,6 +120,30 @@
           dockerfile: 'Dockerfile'
           <<: *master
           <<: *other-receivers
+      - 'clover-controller':
+          project: 'clover'
+          dockerdir: 'clover/controller'
+          dockerfile: 'docker/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-collector':
+          project: 'clover'
+          dockerdir: 'clover/collector'
+          dockerfile: 'docker/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-jmeter-master':
+          project: 'clover'
+          dockerdir: 'clover/tools/jmeter'
+          dockerfile: 'jmeter-master/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-jmeter-slave':
+          project: 'clover'
+          dockerdir: 'clover/tools/jmeter'
+          dockerfile: 'jmeter-slave/Dockerfile'
+          <<: *master
+          <<: *other-receivers
       - 'clover-sample-app':
           project: 'clover'
           dockerdir: 'samples/scenarios/sample_app'
@@ -150,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':
@@ -291,8 +312,8 @@
           <<: *storperf-receivers
       - 'yardstick':
           project: 'yardstick'
-          <<: *fraser
-          <<: *other-receivers
+          <<: *gambia
+          <<: *yardstick-receivers
       # projects with jobs for fraser
       - 'bottlenecks':
           project: 'bottlenecks'