Enable fuel nosdn scenario for master and stable/brahmaputra

[releng.git] / jjb / yardstick / yardstick-ci-jobs.yml

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 470bf68..f88a399 100644 (file)
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -20,50 +20,30 @@
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
-#      Current Mapping
-#--------------------------------
-#  everything runs against master branch
+#        brahmaputra
 #--------------------------------
     pod:
         - opnfv-jump-2:
             installer: fuel
-            <<: *master
+            <<: *brahmaputra
+        - intel-pod5:
+            installer: joid
+            <<: *brahmaputra
+#--------------------------------
+#        master
+#--------------------------------
         - ericsson-pod1:
             installer: fuel
             <<: *master
         - 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
@@ -131,9 +111,10 @@
                 -e "INSTALLER_TYPE=${INSTALLER_TYPE}" \
                 -e "INSTALLER_IP=${INSTALLER_IP}" \
                 -e "POD_NAME=${NODE_NAME}" \
-                -e "EXTERNAL_NETWORK=net04_ext" \
+                -e "EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" \
+                -e "YARDSTICK_BRANCH=${GERRIT_BRANCH}" \
                 opnfv/yardstick \
-                run_tests.sh \
+                run_tests.sh $YARDSTICK_DB_BACKEND \
                 $YARDSTICK_SUITE_NAME
 
             echo "Yardstick: done!"
@@ -172,12 +153,28 @@
 ########################
 # 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:
         - string:
             name: YARDSTICK_DB_BACKEND
-            default: 'none'
+            default: ''
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
@@ -185,7 +182,7 @@
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
-            default: 'none'
+            default: ''
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
@@ -193,7 +190,7 @@
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
-            default: 'db_args'
+            default: '-r 213.77.62.197'
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
@@ -201,5 +198,5 @@
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
-            default: 'none'
+            default: ''
             description: 'Arguments to use in order to choose the backend DB'