summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/calipso/calipso.yaml2
-rw-r--r--jjb/ci_gate_security/opnfv-ci-gate-security.yaml4
-rw-r--r--jjb/conductor/conductor.yaml8
-rw-r--r--jjb/global/releng-macros.yaml16
-rw-r--r--jjb/octopus/octopus-views.yaml7
-rw-r--r--jjb/promise/promise-views.yaml6
-rw-r--r--jjb/yardstick/yardstick-project-jobs.yaml2
-rw-r--r--releases/iruya/edgecloud.yaml9
8 files changed, 12 insertions, 42 deletions
diff --git a/jjb/calipso/calipso.yaml b/jjb/calipso/calipso.yaml
index 6701e7ca2..7ecabdf29 100644
--- a/jjb/calipso/calipso.yaml
+++ b/jjb/calipso/calipso.yaml
@@ -62,4 +62,4 @@
set -o nounset
set -o pipefail
cd $WORKSPACE
- PYTHONPATH=$PWD/app app/test/verify.sh
+ PYTHONPATH=$PWD api/test/verify.sh
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
@@ -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:
@@ -866,14 +858,6 @@
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:
- email-ext:
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
diff --git a/jjb/yardstick/yardstick-project-jobs.yaml b/jjb/yardstick/yardstick-project-jobs.yaml
index 74734b895..e4d0be6bf 100644
--- a/jjb/yardstick/yardstick-project-jobs.yaml
+++ b/jjb/yardstick/yardstick-project-jobs.yaml
@@ -17,7 +17,7 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
- - hunter: &hunter
+ - iruya: &iruya
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
diff --git a/releases/iruya/edgecloud.yaml b/releases/iruya/edgecloud.yaml
new file mode 100644
index 000000000..123af8ac2
--- /dev/null
+++ b/releases/iruya/edgecloud.yaml
@@ -0,0 +1,9 @@
+---
+project: edgecloud
+project-type: feature
+release-model: stable
+
+branches:
+ - name: stable/iruya
+ location:
+ edgecloud: 58c068f9455441e25f41de3224f20d83f84bcb46