From: Aric Gardner <agardner@linuxfoundation.org>
Date: Tue, 7 Jan 2020 18:31:56 +0000 (+0000)
Subject: Merge "Remove Conductor Jobs"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9463a096d13d78085ce882177f2a3864bf2f6dbe;hp=-c;p=releng.git

Merge "Remove Conductor Jobs"
---

9463a096d13d78085ce882177f2a3864bf2f6dbe
diff --combined jjb/ci_gate_security/opnfv-ci-gate-security.yaml
index 3aebd3e1c,1def6e89c..1f75829a7
--- a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
+++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
@@@ -22,7 -22,6 +22,6 @@@
        - bottlenecks
        - calipso
        - clover
-       - conductor
        - container4nfv
        - cperf
        - daisy
@@@ -48,6 -47,7 +47,6 @@@
        - ovsnfv
        - parser
        - pharos
 -      - promise
        - qtip
        - releng
        - releng-anteater
@@@ -148,7 -148,7 +147,7 @@@
                  comment-contains-value: 'recheck'
            projects:
              - project-compare-type: 'REG_EXP'
-               project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|conductor|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon'
+               project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon'
                branches:
                  - branch-compare-type: 'ANT'
                    branch-pattern: '**/{branch}'
diff --combined jjb/global/releng-macros.yaml
index 35a0adbe4,ad9ed86fe..059903531
--- a/jjb/global/releng-macros.yaml
+++ b/jjb/global/releng-macros.yaml
@@@ -641,14 -641,6 +641,6 @@@
            recipients: >
              stephen.wong1@huawei.com
  
- - publisher:
-     name: 'email-conductor-ptl'
-     publishers:
-       - email-ext:
-           <<: *email_ptl_defaults
-           recipients: >
-             limingjiang@huawei.com
- 
  - publisher:
      name: 'email-container4nfv-ptl'
      publishers:
@@@ -865,6 -857,14 +857,6 @@@
          recipients: >
            pberberian@iol.unh.edu
  
 -- publisher:
 -    name: 'email-promise-ptl'
 -    publishers:
 -      - email-ext:
 -          <<: *email_ptl_defaults
 -          recipients: >
 -            kunzmann@docomolab-euro.com
 -
  - publisher:
      name: 'email-qtip-ptl'
      publishers: