summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerena Feng <feng.xiaowei@zte.com.cn>2018-09-12 08:14:51 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-12 08:14:51 +0000
commit1c4cc0319e5b1c37b9221b776ea264cacf8f1478 (patch)
treea1ca85e3078b4a07de58f181b41f9db601a5e739
parentc20919f1f430cfbad1238a6d74b9c782f696732d (diff)
parentdbbec4abb146567d81f4af96a66690fa53f5e1fa (diff)
Merge "Update Functest jobs to manage new branches"
-rw-r--r--jjb/functest/functest-daily-jobs.yaml8
-rw-r--r--jjb/functest/functest-docker.yaml10
-rw-r--r--jjb/functest/functest-kubernetes-docker.yaml6
-rw-r--r--jjb/functest/functest-kubernetes-project-jobs.yaml8
-rw-r--r--jjb/functest/functest-project-jobs.yaml8
-rw-r--r--jjb/functest/xtesting-docker.yaml6
-rw-r--r--jjb/functest/xtesting-project-jobs.yaml8
7 files changed, 54 insertions, 0 deletions
diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml
index 763d1d4f0..9262988e1 100644
--- a/jjb/functest/functest-daily-jobs.yaml
+++ b/jjb/functest/functest-daily-jobs.yaml
@@ -18,6 +18,14 @@
stream: fraser
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
+ gambia: &gambia
+ stream: gambia
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ hunter: &hunter
+ stream: hunter
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
# -------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
# -------------------------------
diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index fc2fd3cae..14134fa56 100644
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -12,6 +12,12 @@
- master:
branch: '{stream}'
disabled: false
+ - hunter:
+ branch: 'stable/{stream}'
+ disabled: false
+ - gambia:
+ branch: 'stable/{stream}'
+ disabled: false
- fraser:
branch: 'stable/{stream}'
disabled: false
@@ -37,6 +43,10 @@
exclude:
- stream: 'master'
image: 'parser'
+ - stream: 'hunter'
+ image: 'parser'
+ - stream: 'gambia'
+ image: 'parser'
- stream: 'fraser'
image: 'tempest'
- stream: 'fraser'
diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml
index 5fbb3be7e..3836103a8 100644
--- a/jjb/functest/functest-kubernetes-docker.yaml
+++ b/jjb/functest/functest-kubernetes-docker.yaml
@@ -12,6 +12,12 @@
- master:
branch: '{stream}'
disabled: false
+ - hunter:
+ branch: 'stable/{stream}'
+ disabled: false
+ - gambia:
+ branch: 'stable/{stream}'
+ disabled: false
- fraser:
branch: 'stable/{stream}'
disabled: false
diff --git a/jjb/functest/functest-kubernetes-project-jobs.yaml b/jjb/functest/functest-kubernetes-project-jobs.yaml
index 7f8dd8d53..46b77ce68 100644
--- a/jjb/functest/functest-kubernetes-project-jobs.yaml
+++ b/jjb/functest/functest-kubernetes-project-jobs.yaml
@@ -18,6 +18,14 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
+ - hunter: &hunter
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
+ - gambia: &gambia
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
- fraser: &fraser
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
diff --git a/jjb/functest/functest-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml
index 9a123053f..b7220a83c 100644
--- a/jjb/functest/functest-project-jobs.yaml
+++ b/jjb/functest/functest-project-jobs.yaml
@@ -18,6 +18,14 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
+ - hunter:
+ branch: 'stable/{stream}'
+ gs-pathname: ''
+ disabled: false
+ - gambia:
+ branch: 'stable/{stream}'
+ gs-pathname: ''
+ disabled: false
- fraser: &fraser
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
diff --git a/jjb/functest/xtesting-docker.yaml b/jjb/functest/xtesting-docker.yaml
index 251c3954e..84bcb2185 100644
--- a/jjb/functest/xtesting-docker.yaml
+++ b/jjb/functest/xtesting-docker.yaml
@@ -12,6 +12,12 @@
- master:
branch: '{stream}'
disabled: false
+ - hunter:
+ branch: 'stable/{stream}'
+ disabled: false
+ - gambia:
+ branch: 'stable/{stream}'
+ disabled: false
- fraser:
branch: 'stable/{stream}'
disabled: false
diff --git a/jjb/functest/xtesting-project-jobs.yaml b/jjb/functest/xtesting-project-jobs.yaml
index e109387c6..239ae9f9b 100644
--- a/jjb/functest/xtesting-project-jobs.yaml
+++ b/jjb/functest/xtesting-project-jobs.yaml
@@ -18,6 +18,14 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
+ - hunter: &hunter
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
+ - gambia: &gambia
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
- fraser: &fraser
branch: 'stable/{stream}'
gs-pathname: '/{stream}'