summaryrefslogtreecommitdiffstats
path: root/jjb/functest
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/functest')
-rw-r--r--jjb/functest/functest-ci-jobs.yml51
1 files changed, 8 insertions, 43 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 44221431d..f844b1631 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -20,15 +20,19 @@
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
-# Current Mapping
-#--------------------------------
-# everything runs against master branch
+# brahmaputra
#--------------------------------
pod:
+ - intel-pod5:
+ installer: joid
+ <<: *brahmaputra
+#--------------------------------
+# master
+#--------------------------------
- huawei-us-deploy-bare-1:
installer: compass
<<: *master
- - intel-pod5:
+ - intel-pod6:
installer: joid
<<: *master
- intel-us-deploy-virtual-2:
@@ -50,45 +54,6 @@
installer: joid
<<: *master
#--------------------------------
-# Milestone E Mapping
-# !!!DO NOT ENABLE!!!
-#--------------------------------
-# brahmaputra
-#--------------------------------
-# - huawei-us-deploy-bare-1:
-# installer: compass
-# <<: *brahmaputra
-# - intel-pod5:
-# installer: joid
-# <<: *brahmaputra
-# - opnfv-jump-1:
-# installer: apex
-# <<: *brahmaputra
-# - opnfv-jump-2:
-# installer: fuel
-# <<: *brahmaputra
-#--------------------------------
-# master
-#--------------------------------
-# - ericsson-pod2:
-# installer: fuel
-# <<: *master
-# - intelpod2-jumphost:
-# installer: apex
-# <<: *master
-# - intel-pod6:
-# installer: joid
-# <<: *master
-# - intel-pod8:
-# installer: compass
-# <<: *master
-# - orange-test1:
-# installer: fuel
-# <<: *master
-# - orange-pod2:
-# installer: joid
-# <<: *master
-#--------------------------------
testsuite:
- 'daily'