From: Aric Gardner <agardner@linuxfoundation.org>
Date: Wed, 8 Jan 2020 15:08:32 +0000 (+0000)
Subject: Merge "Stable branch for edgecloud"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3443bbdf28675dd08147ef851aefbff81b92d0bb;hp=7e5c08d61427eebc3b109d866f53f8e086dd60dc;p=releng.git

Merge "Stable branch for edgecloud"
---

diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index 98d0ae3c3..b78d124b6 100644
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -10,7 +10,7 @@
     tag:
       - latest:
           branch: master
-          slave: intel-pod10
+          slave: intel-pod15
           functest_tag: hunter
 
 - parameter:
diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
index 649538e69..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
@@ -48,7 +47,6 @@
       - ovsnfv
       - parser
       - pharos
-      - promise
       - qtip
       - releng
       - releng-anteater
@@ -149,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 5b1bdee0a..059903531 100644
--- 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:
@@ -865,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:
diff --git a/jjb/octopus/octopus-views.yaml b/jjb/octopus/octopus-views.yaml
deleted file mode 100644
index 00bc090ad..000000000
--- a/jjb/octopus/octopus-views.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- project:
-    name: octopus-view
-    views:
-      - common-view
-    view-name: octopus
-    view-regex: ^octopus.*
diff --git a/jjb/promise/promise-views.yaml b/jjb/promise/promise-views.yaml
deleted file mode 100644
index 6f67d6437..000000000
--- a/jjb/promise/promise-views.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- project:
-    name: promise-view
-    views:
-      - project-view
-    project-name: promise