Merge "barometer: Add job definition for barometer-collectd-experimental image"

diff --combined jjb/releng/opnfv-docker.yaml
index f334c67,c5a0967..93788d7
--- 1/jjb/releng/opnfv-docker.yaml
--- 2/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@@ -11,11 -11,27 +11,11 @@@
        stream: master
        branch: '{stream}'
        disabled: false
 -    danube: &danube
 -      stream: danube
 -      branch: 'stable/{stream}'
 -      disabled: false
 -    euphrates: &euphrates
 -      stream: euphrates
 -      branch: 'stable/{stream}'
 -      disabled: false
 -    fraser: &fraser
 -      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
 +    laas-receivers: &laas_receivers
        receivers: >
            pberberian@iol.unh.edu
            sbergeron@iol.unh.edu
@@@ -48,6 -64,12 +48,12 @@@
            dockerdir: 'docker/barometer-collectd'
            <<: *master
            <<: *other-receivers
+       - 'barometer-collectd-experimental':
+           project: 'barometer'
+           dockerdir: '.'
+           dockerfile: 'docker/barometer-collectd-experimental/Dockerfile'
+           <<: *master
+           <<: *other-receivers
        - 'barometer-collectd-master':
            project: 'barometer'
            dockerdir: '.'
@@@ -200,18 -222,18 +206,18 @@@
            project: 'nfvbench'
            <<: *master
            <<: *other-receivers
 -      - 'pharos-tools-laas-dashboard':
 -          project: 'pharos-tools'
 -          dockerdir: 'dashboard'
 +      - 'laas-dashboard':
 +          project: 'laas'
 +          dockerdir: '.'
            dockerfile: 'web/Dockerfile'
            <<: *master
 -          <<: *pharos_tools_receivers
 -      - 'pharos-tools-laas-celery':
 -          project: 'pharos-tools'
 -          dockerdir: 'dashboard'
 +          <<: *laas_receivers
 +      - 'laas-celery':
 +          project: 'laas'
 +          dockerdir: '.'
            dockerfile: 'worker/Dockerfile'
            <<: *master
 -          <<: *pharos_tools_receivers
 +          <<: *laas_receivers
        - 'qtip':
            project: 'qtip'
            dockerdir: '.'
@@@ -268,86 -290,141 +274,92 @@@
            <<: *master
            <<: *yardstick-receivers
  
 -      # projects with jobs for euphrates
 +      # projects with jobs for hunter
        - 'barometer-dma':
            project: 'barometer'
            dockerdir: 'docker/barometer-dma'
 -          <<: *gambia
 +          <<: *hunter
            <<: *other-receivers
        - 'barometer-collectd':
            project: 'barometer'
            dockerdir: 'docker/barometer-collectd'
 -          <<: *gambia
 +          <<: *hunter
            <<: *other-receivers
+       - 'barometer-collectd-experimental':
+           project: 'barometer'
+           dockerdir: '.'
+           dockerfile: 'docker/barometer-collectd-experimental/Dockerfile'
+           <<: *gambia
+           <<: *other-receivers
        - 'barometer-collectd-master':
            project: 'barometer'
            dockerdir: '.'
            dockerfile: 'docker/barometer-collectd-master/Dockerfile'
 -          <<: *gambia
 +          <<: *hunter
            <<: *other-receivers
        - 'barometer-grafana':
            project: 'barometer'
            dockerdir: 'docker/barometer-grafana'
 -          <<: *gambia
 +          <<: *hunter
            <<: *other-receivers
        - 'barometer-influxdb':
            project: 'barometer'
            dockerdir: 'docker/barometer-influxdb'
 -          <<: *gambia
 +          <<: *hunter
            <<: *other-receivers
        - 'barometer-kafka':
            project: 'barometer'
            dockerdir: 'docker/barometer-kafka'
 -          <<: *gambia
 +          <<: *hunter
            <<: *other-receivers
        - 'barometer-ves':
            project: 'barometer'
            dockerdir: 'docker/barometer-ves'
 -          <<: *gambia
 +          <<: *hunter
            <<: *other-receivers
        - 'barometer-snmp':
            project: 'barometer'
            dockerdir: 'docker/barometer-snmp'
 -          <<: *gambia
 +          <<: *hunter
            <<: *other-receivers
        - 'bottlenecks':
            project: 'bottlenecks'
 -          <<: *gambia
 -          <<: *other-receivers
 -      - 'nfvbench':
 -          project: 'nfvbench'
 -          <<: *fraser
 -          <<: *other-receivers
 -      - 'qtip':
 -          project: 'qtip'
 -          dockerdir: '.'
 -          dockerfile: 'docker/Dockerfile.local'
 -          <<: *fraser
 +          <<: *hunter
            <<: *other-receivers
        - 'storperf-master':
            project: 'storperf'
            dockerdir: 'docker/storperf-master'
            arch_tag: 'x86_64'
 -          <<: *gambia
 +          <<: *hunter
            <<: *storperf-receivers
        - 'storperf-graphite':
            project: 'storperf'
            dockerdir: 'docker/storperf-graphite'
            arch_tag: 'x86_64'
 -          <<: *gambia
 +          <<: *hunter
            <<: *storperf-receivers
        - 'storperf-httpfrontend':
            project: 'storperf'
            dockerdir: 'docker/storperf-httpfrontend'
            arch_tag: 'x86_64'
 -          <<: *gambia
 +          <<: *hunter
            <<: *storperf-receivers
        - 'storperf-reporting':
            project: 'storperf'
            dockerdir: 'docker/storperf-reporting'
            arch_tag: 'x86_64'
 -          <<: *gambia
 +          <<: *hunter
            <<: *storperf-receivers
        - 'storperf-swaggerui':
            project: 'storperf'
            dockerdir: 'docker/storperf-swaggerui'
            arch_tag: 'x86_64'
 -          <<: *gambia
 +          <<: *hunter
            <<: *storperf-receivers
        - 'yardstick':
            project: 'yardstick'
            <<: *hunter
            <<: *yardstick-receivers
 -      # projects with jobs for fraser
 -      - 'bottlenecks':
 -          project: 'bottlenecks'
 -          <<: *fraser
 -          <<: *other-receivers
 -      - 'clover':
 -          project: 'clover'
 -          dockerdir: '.'
 -          dockerfile: 'docker/Dockerfile'
 -          <<: *fraser
 -          <<: *other-receivers
 -      - 'clover-ns-nginx-lb':
 -          project: 'clover'
 -          dockerdir: 'samples/services/nginx/docker'
 -          dockerfile: 'subservices/lb/Dockerfile'
 -          <<: *fraser
 -          <<: *other-receivers
 -      - 'clover-ns-nginx-proxy':
 -          project: 'clover'
 -          dockerdir: 'samples/services/nginx/docker'
 -          dockerfile: 'subservices/proxy/Dockerfile'
 -          <<: *fraser
 -          <<: *other-receivers
 -      - 'clover-ns-nginx-server':
 -          project: 'clover'
 -          dockerdir: 'samples/services/nginx/docker'
 -          dockerfile: 'subservices/server/Dockerfile'
 -          <<: *fraser
 -          <<: *other-receivers
 -      - 'clover-ns-snort-ids':
 -          project: 'clover'
 -          dockerdir: 'samples/services/snort_ids/docker'
 -          dockerfile: 'Dockerfile'
 -          <<: *fraser
 -          <<: *other-receivers
 -      - 'dovetail':
 -          project: 'dovetail'
 -          <<: *fraser
 -          <<: *other-receivers
      # yamllint enable rule:key-duplicates
      jobs:
        - "{dockerrepo}-docker-build-push-{stream}"