Merge "Remove Conductor Jobs"

diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
index 3aebd3e..1f75829 100644 (file)
--- a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
+++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
@@ -22,7 +22,6 @@
       - bottlenecks
       - calipso
       - clover
-      - conductor
       - container4nfv
       - cperf
       - daisy
@@ -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 --git a/jjb/conductor/conductor.yaml b/jjb/conductor/conductor.yaml
deleted file mode 100644 (file)
index 8a128da..0000000
--- a/jjb/conductor/conductor.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- project:
-    name: conductor
-
-    project: '{name}'
-
-    jobs:
-      - '{project}-verify-basic'

diff --git a/jjb/global/releng-macros.yaml b/jjb/global/releng-macros.yaml
index 35a0adb..0599035 100644 (file)
--- a/jjb/global/releng-macros.yaml
+++ b/jjb/global/releng-macros.yaml
@@ -641,14 +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: