Merge "Add parameter of external network for yardstick testing"

diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index dc170f7..8a189ec 100644 (file)
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -17,6 +17,10 @@
             name: OPNFV_FEATURE
             default: 'none'
             description: 'OPNFV Feature to activate'
+        - string:
+            name: EXTERNAL_NETWORK
+            default: 'net04_ext'
+            description: 'external network for test'
 
 - parameter:
     name: 'compass-defaults'
@@ -37,6 +41,10 @@
             name: OPNFV_FEATURE
             default: 'none'
             description: 'OPNFV Feature to activate'
+        - string:
+            name: EXTERNAL_NETWORK
+            default: 'ext-net'
+            description: 'external network for test'
 
 - parameter:
     name: 'fuel-defaults'
@@ -61,6 +69,10 @@
             name: DEPLOY_SCENARIO
             default: 'test'
             description: 'OPNFV Deployment Scenario'
+        - string:
+            name: EXTERNAL_NETWORK
+            default: 'net04_ext'
+            description: 'external network for test'
 
 - parameter:
     name: 'joid-defaults'
@@ -89,3 +101,7 @@
             name: OS_RELEASE
             default: 'liberty'
             description: 'OpenStack release (kilo|liberty)'
+        - string:
+            name: EXTERNAL_NETWORK
+            default: 'net04_ext'
+            description: 'external network for test'

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 0ef6c9b..484f1a2 100644 (file)
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -131,7 +131,7 @@
                 -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}" \
                 opnfv/yardstick \
                 run_tests.sh $YARDSTICK_DB_BACKEND \
                 $YARDSTICK_SUITE_NAME