Merge "Send 'Build Failed' Emails to Jenkins Admins"

diff --combined jjb/bottlenecks/bottlenecks-ci-jobs.yml
index c61c245,611e21c..71601cf
--- 1/jjb/bottlenecks/bottlenecks-ci-jobs.yml
--- 2/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@@ -35,22 -35,22 +35,22 @@@
      pod:
  #compass CI PODs
          - baremetal:
 -            slave-label: compass-baremetal
 +            slave-label: compass-baremetal-master
              installer: compass
              auto-trigger-name: 'daily-trigger-disabled'
              <<: *master
          - virtual:
 -            slave-label: compass-virtual
 +            slave-label: compass-virtual-master
              installer: compass
              auto-trigger-name: 'daily-trigger-disabled'
              <<: *master
          - baremetal:
 -            slave-label: compass-baremetal
 +            slave-label: compass-baremetal-branch
              installer: compass
              auto-trigger-name: 'daily-trigger-disabled'
              <<: *danube
          - virtual:
 -            slave-label: compass-virtual
 +            slave-label: compass-virtual-branch
              installer: compass
              auto-trigger-name: 'daily-trigger-disabled'
              <<: *danube
@@@ -129,6 -129,7 +129,7 @@@
      publishers:
          - email:
              recipients: gabriel.yuyang@huawei.com, liyin11@huawei.com
+         - email-jenkins-admins-on-failure
  
  ########################
  # builder macros
@@@ -150,33 -151,25 +151,33 @@@
  ####################
  
  - parameter:
 -    name: 'bottlenecks-params-compass-baremetal'
 +    name: 'bottlenecks-params-compass-baremetal-master'
      parameters:
          - string:
              name: BOTTLENECKS_DB_TARGET
 -            default: '104.197.68.199:8086'
 +            default: 'http://testresults.opnfv.org/test/api/v1/results'
              description: 'Arguments to use in order to choose the backend DB'
  
  - parameter:
 -    name: 'bottlenecks-params-compass-virtual'
 +    name: 'bottlenecks-params-compass-virtual-master'
      parameters:
          - string:
              name: BOTTLENECKS_DB_TARGET
 -            default: ''
 +            default: 'http://testresults.opnfv.org/test/api/v1/results'
              description: 'Arguments to use in order to choose the backend DB'
  
  - parameter:
 -    name: 'bottlenecks-params-orange-pod2'
 +    name: 'bottlenecks-params-compass-baremetal-branch'
      parameters:
          - string:
              name: BOTTLENECKS_DB_TARGET
 -            default: '104.197.68.199:8086'
 +            default: 'http://testresults.opnfv.org/test/api/v1/results'
 +            description: 'Arguments to use in order to choose the backend DB'
 +
 +- parameter:
 +    name: 'bottlenecks-params-compass-virtual-branch'
 +    parameters:
 +        - string:
 +            name: BOTTLENECKS_DB_TARGET
 +            default: 'http://testresults.opnfv.org/test/api/v1/results'
              description: 'Arguments to use in order to choose the backend DB'

diff --combined jjb/doctor/doctor.yml
index a307b18,4fd783f..afde9ef
--- 1/jjb/doctor/doctor.yml
--- 2/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@@ -114,7 -114,6 +114,7 @@@
          - '{auto-trigger-name}':
              project: '{project}'
              branch: '{branch}'
 +            files: 'tests/**'
  
      builders:
          - shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
@@@ -180,7 -179,6 +180,7 @@@
          - '{auto-trigger-name}':
              project: '{project}'
              branch: '{branch}'
 +            files: 'tests/**'
  
      builders:
          - 'clean-workspace-log'
@@@ -208,6 -206,7 +208,7 @@@
              artifacts: 'tests/*.log'
          - archive:
              artifacts: 'functest_results/$FUNCTEST_SUITE_NAME.log'
+         - email-jenkins-admins-on-failure
  
  
  #####################################
@@@ -236,7 -235,7 +237,7 @@@
                      branch-pattern: '**/{branch}'
                  file-paths:
                    - compare-type: ANT
 -                    pattern: 'tests/**'
 +                    pattern: '{files}'
              skip-vote:
                  successful: true
                  failed: true

diff --combined jjb/dovetail/dovetail-ci-jobs.yml
index fd3b912,0eadc7c..3f130c9
--- 1/jjb/dovetail/dovetail-ci-jobs.yml
--- 2/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@@ -25,7 -25,7 +25,7 @@@
          branch: 'stable/{stream}'
          dovetail-branch: master
          gs-pathname: '/{stream}'
 -        docker-tag: 'cvp.0.3.0'
 +        docker-tag: 'cvp.0.4.0'
  
  #-----------------------------------
  # POD, PLATFORM, AND BRANCH MAPPING
@@@ -257,6 -257,7 +257,7 @@@
              artifacts: 'results/**/*'
              allow-empty: true
              fingerprint: true
+         - email-jenkins-admins-on-failure
  
  #--------------------------
  # builder macros