diff options
| author |   Jun Li <matthew.lijun@huawei.com> | 2016-01-06 11:12:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-06 11:12:58 +0000 |
| commit | 3f1f8344838cb7cfe8efe1aecde75c524441430f (patch) | |
| tree | d32001111539a7c8c0298562a3d9f492b3b5c648 | |
| parent | b2bd6b80dff491064a1860bd2c85bb448154f855 (diff) | |
| parent | 9dcb8bd01a9dfc5f8aaf3c15701f371ae35f5f48 (diff) | |
Merge "Add parameter of external network for yardstick testing"
| -rw-r--r-- | jjb/opnfv/installer-params.yml | 16 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index dc170f79a..8a189ece8 100644 --- 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 0ef6c9b3f..484f1a20b 100644 --- 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 |