summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/ci_gate_security/opnfv-ci-gate-security.yml6
-rw-r--r--jjb/global/releng-macros.yml40
-rw-r--r--jjb/global/slave-params.yml11
-rw-r--r--jjb/octopus/octopus.yml11
-rw-r--r--jjb/prediction/prediction.yml8
-rw-r--r--jjb/releng/opnfv-lint.yml2
6 files changed, 2 insertions, 76 deletions
diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yml b/jjb/ci_gate_security/opnfv-ci-gate-security.yml
index 56aee174c..cd3831310 100644
--- a/jjb/ci_gate_security/opnfv-ci-gate-security.yml
+++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yml
@@ -34,7 +34,6 @@
- dovetail
- dpacc
- enfv
- - fastpathmetrics
- fds
- fuel
- functest
@@ -43,12 +42,9 @@
- kvmfornfv
- models
- moon
- - multisite
- netready
- nfvbench
- - octopus
- onosfw
- - openretriever
- opera
- opnfvdocs
- orchestra
@@ -159,7 +155,7 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'REG_EXP'
- project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|copper|cperf|daisy|doctor|dovetail|dpacc|enfv|escalator|fds|fuel|functest|octopus|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|lsoapi|models|moon|multisite|netready'
+ project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|copper|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|functest|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon|netready'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index d70e7e0a5..f473d8541 100644
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -686,22 +686,6 @@
JBuchanan@advaoptical.com
- publisher:
- name: 'email-escalator-ptl'
- publishers:
- - email-ext:
- <<: *email_ptl_defaults
- recipients: >
- kong.wei2@zte.com.cn
-
-- publisher:
- name: 'email-fastpathmetrics-ptl'
- publishers:
- - email-ext:
- <<: *email_ptl_defaults
- recipients: >
- maryam.tahhan@intel.com
-
-- publisher:
name: 'email-fds-ptl'
publishers:
- email-ext:
@@ -766,14 +750,6 @@
ruan.he@orange.com
- publisher:
- name: 'email-multisite-ptl'
- publishers:
- - email-ext:
- <<: *email_ptl_defaults
- recipients: >
- joehuang@huawei.com
-
-- publisher:
name: 'email-netready-ptl'
publishers:
- email-ext:
@@ -790,14 +766,6 @@
ahothan@cisco.com
- publisher:
- name: 'email-octopus-ptl'
- publishers:
- - email-ext:
- <<: *email_ptl_defaults
- recipients: >
- ulrich.kleber@huawei.com
-
-- publisher:
name: 'email-onosfw-ptl'
publishers:
- email-ext:
@@ -806,14 +774,6 @@
su.wei@huawei.com
- publisher:
- name: 'email-openretriever-ptl'
- publishers:
- - email-ext:
- <<: *email_ptl_defaults
- recipients: >
- jiaxuan@chinamobile.com
-
-- publisher:
name: 'email-opera-ptl'
publishers:
- email-ext:
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index ee6357890..9d8bed45f 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -1015,17 +1015,6 @@
description: 'SSH key to be used'
- parameter:
- name: 'multisite-virtual-defaults'
- parameters:
- - label:
- name: SLAVE_LABEL
- default: 'multisite-virtual'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
name: 'ericsson-virtual5-defaults'
parameters:
- label:
diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
deleted file mode 100644
index a04d7f10d..000000000
--- a/jjb/octopus/octopus.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-################################
-# job configuration for Octopus
-################################
-- project:
- name: octopus
-
- project: '{name}'
-
- jobs:
- - '{project}-verify-basic'
diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml
deleted file mode 100644
index b686d9524..000000000
--- a/jjb/prediction/prediction.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- project:
- name: prediction
-
- project: '{name}'
-
- jobs:
- - '{project}-verify-basic'
diff --git a/jjb/releng/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml
index 80893de89..f8e994c90 100644
--- a/jjb/releng/opnfv-lint.yml
+++ b/jjb/releng/opnfv-lint.yml
@@ -172,7 +172,7 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'REG_EXP'
- project-pattern: 'armband|fuel|octopus|releng-anteater'
+ project-pattern: 'armband|fuel|releng-anteater'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'