Merge "[barometer] Update the collectd-latest container name"

diff --combined jjb/releng/opnfv-docker.yaml
index d7a54c2,d319a01..ac1c574
--- 1/jjb/releng/opnfv-docker.yaml
--- 2/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@@ -26,6 -26,9 +26,6 @@@
      storperf-receivers: &storperf-receivers
        receivers: >
            mbeierl@vmware.com
 -    yardstick-receivers: &yardstick-receivers
 -      receivers: >
 -          rexlee8776@gmail.com
      other-receivers: &other-receivers
        receivers: ''
  
@@@ -55,10 -58,10 +55,10 @@@
            dockerfile: 'docker/barometer-collectd-experimental/Dockerfile'
            <<: *master
            <<: *other-receivers
-       - 'barometer-collectd-master':
+       - 'barometer-collectd-latest':
            project: 'barometer'
            dockerdir: '.'
-           dockerfile: 'docker/barometer-collectd-master/Dockerfile'
+           dockerfile: 'docker/barometer-collectd-latest/Dockerfile'
            <<: *master
            <<: *other-receivers
        - 'barometer-dma':
@@@ -91,6 -94,10 +91,6 @@@
            dockerdir: 'docker/barometer-snmp'
            <<: *master
            <<: *other-receivers
 -      - 'bottlenecks':
 -          project: 'bottlenecks'
 -          <<: *master
 -          <<: *other-receivers
        - 'clover':
            project: 'clover'
            dockerdir: '.'
@@@ -175,6 -182,10 +175,6 @@@
            dockerfile: 'Dockerfile'
            <<: *master
            <<: *other-receivers
 -      - 'cperf':
 -          project: 'cperf'
 -          <<: *master
 -          <<: *other-receivers
        - 'dovetail':
            project: 'dovetail'
            <<: *master
@@@ -211,6 -222,17 +211,6 @@@
            dockerfile: 'worker/Dockerfile'
            <<: *master
            <<: *laas_receivers
 -      - 'qtip':
 -          project: 'qtip'
 -          dockerdir: '.'
 -          dockerfile: 'docker/Dockerfile.local'
 -          <<: *master
 -          <<: *other-receivers
 -      - 'qtip-nettest':
 -          project: 'qtip'
 -          dockerdir: 'contrib/nettest'
 -          <<: *master
 -          <<: *other-receivers
        - 'storperf-master':
            project: 'storperf'
            dockerdir: 'docker/storperf-master'
@@@ -247,14 -269,40 +247,14 @@@
            arch_tag: 'x86_64'
            <<: *master
            <<: *storperf-receivers
 -      - 'yardstick':
 -          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'
 -          <<: *master
 -          <<: *yardstick-receivers
  
        # projects with jobs for hunter
 -      - 'bottlenecks':
 -          project: 'bottlenecks'
 -          <<: *hunter
 -          <<: *other-receivers
        - 'dovetail':
            project: 'dovetail'
            <<: *hunter
            <<: *other-receivers
 -      - 'yardstick':
 -          project: 'yardstick'
 -          <<: *hunter
 -          <<: *yardstick-receivers
  
        # projects with jobs for iruya
 -      - 'yardstick':
 -          project: 'yardstick'
 -          <<: *iruya
 -          <<: *yardstick-receivers
        - 'barometer-dma':
            project: 'barometer'
            dockerdir: 'docker/barometer-dma'
@@@ -343,6 -391,24 +343,6 @@@
      jobs:
        - "{dockerrepo}-docker-build-push-{stream}"
  
 -- project:
 -
 -    name: opnfv-monitor-docker        # projects which only monitor dedicated file or path
 -
 -    dockerfile: "Dockerfile"
 -    dockerdir: "docker"
 -    arch_tag: ""
 -    extra_build_args: ""
 -
 -    project:
 -      # projects with jobs for master
 -      - 'daisy':
 -          dockerrepo: 'daisy'
 -          <<: *master
 -
 -    jobs:
 -      - '{project}-docker-build-push-monitor-{stream}'
 -
  ########################
  # job templates
  ########################
@@@ -411,3 -477,30 +411,3 @@@
        - email:
            recipients: '{receivers}'
        - email-jenkins-admins-on-failure
 -
 -- job-template:
 -    name: '{project}-docker-build-push-monitor-{stream}'
 -    disabled: '{obj:disabled}'
 -    parameters: *parameters
 -
 -    scm:
 -      - git-scm
 -
 -    builders: *builders
 -
 -    # trigger only matching the file name
 -    triggers:
 -      - gerrit:
 -          trigger-on:
 -            - change-merged-event
 -            - comment-added-contains-event:
 -                comment-contains-value: 'remerge'
 -          projects:
 -            - project-compare-type: 'ANT'
 -              project-pattern: '{project}'
 -              branches:
 -                - branch-compare-type: 'ANT'
 -                  branch-pattern: '**/{branch}'
 -              file-paths:
 -                - compare-type: ANT
 -                  pattern: 'docker/**'