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

diff --combined jjb/releng/opnfv-docker.yaml
index 40e62b3,895dcc2..5b93b0f
--- 1/jjb/releng/opnfv-docker.yaml
--- 2/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@@ -23,10 -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
@@@ -120,6 -116,30 +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,14 -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':
@@@ -288,8 -311,8 +312,8 @@@
            <<: *storperf-receivers
        - 'yardstick':
            project: 'yardstick'
 -          <<: *fraser
 -          <<: *other-receivers
 +          <<: *gambia
 +          <<: *yardstick-receivers
        # projects with jobs for fraser
        - 'bottlenecks':
            project: 'bottlenecks'