diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2020-01-07 18:31:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-01-07 18:31:56 +0000 |
| commit | 9463a096d13d78085ce882177f2a3864bf2f6dbe (patch) | |
| tree | fc5790c72fc8b12de94397a770adc70ff1f78179 | |
| parent | 3e7b08079f5f66940fd68c3be1ce685e4b3ff7cf (diff) | |
| parent | c2c7288b74a6d3331ef753a8c621b0ffcd2fb8da (diff) | |
Merge "Remove Conductor Jobs"
| -rw-r--r-- | jjb/ci_gate_security/opnfv-ci-gate-security.yaml | 3 | ||||
| -rw-r--r-- | jjb/conductor/conductor.yaml | 8 | ||||
| -rw-r--r-- | jjb/global/releng-macros.yaml | 8 |
3 files changed, 1 insertions, 18 deletions
diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml index 3aebd3e1c..1f75829a7 100644 --- 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 index 8a128da37..000000000 --- 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 35a0adbe4..059903531 100644 --- a/jjb/global/releng-macros.yaml +++ b/jjb/global/releng-macros.yaml @@ -642,14 +642,6 @@ 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: - email-ext: |