From 62b0d5baa45d18fb8553aeb5cc2424764a4fac4a Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Thu, 7 Jan 2016 11:10:38 +0100
Subject: Enable joid Arno scenario for master and stable/brahmaputra

This patch proposes below changes:
- Run CI on intel-pod5 against stable/brahmaputra branch
- Run CI on intel-pod6 against master branch
- Configure functest against both branches on both PODs
- Enable yardstick against both branches on both PODs
- Comment out additional controllers until Arno scenario is verified
- Rename OPNFV_FEATURE to DEPLOY_SCENARIO

Please note that there are some duplications which need to be taken
care of in a separate patch.

Change-Id: Ic3deb77692cdb0908808fdb21098af77b937b831
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
---
 jjb/yardstick/yardstick-ci-jobs.yml | 57 ++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 30 deletions(-)

(limited to 'jjb/yardstick')

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 484f1a20b..fb05b3336 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -20,11 +20,15 @@
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
-#      Current Mapping
-#--------------------------------
-#  everything runs against master branch
+#        brahmaputra
 #--------------------------------
     pod:
+        - intel-pod5:
+            installer: joid
+            <<: *brahmaputra
+#--------------------------------
+#        master
+#--------------------------------
         - opnfv-jump-2:
             installer: fuel
             <<: *master
@@ -34,36 +38,12 @@
         - ericsson-pod2:
             installer: fuel
             <<: *master
+        - intel-pod6:
+            installer: joid
+            <<: *master
         - huawei-us-deploy-bare-1:
             installer: compass
             <<: *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-pod1:
-#            installer: fuel
-#            <<: *master
-#        - ericsson-pod2:
-#            installer: fuel
-#            <<: *master
 #--------------------------------
     loop:
         - daily
@@ -132,6 +112,7 @@
                 -e "INSTALLER_IP=${INSTALLER_IP}" \
                 -e "POD_NAME=${NODE_NAME}" \
                 -e "EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" \
+                -e "YARDSTICK_BRANCH=${GERRIT_BRANCH}" \
                 opnfv/yardstick \
                 run_tests.sh $YARDSTICK_DB_BACKEND \
                 $YARDSTICK_SUITE_NAME
@@ -172,6 +153,22 @@
 ########################
 # parameter macros
 ########################
+- parameter:
+    name: 'yardstick-params-intel-pod5'
+    parameters:
+        - string:
+            name: YARDSTICK_DB_BACKEND
+            default: ''
+            description: 'Arguments to use in order to choose the backend DB'
+
+- parameter:
+    name: 'yardstick-params-intel-pod6'
+    parameters:
+        - string:
+            name: YARDSTICK_DB_BACKEND
+            default: ''
+            description: 'Arguments to use in order to choose the backend DB'
+
 - parameter:
     name: 'yardstick-params-ericsson-pod1'
     parameters:
-- 
cgit 1.2.3-korg