diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/prepare_env.sh | 19 | ||||
| -rwxr-xr-x | ci/yardstick-verify | 4 |
2 files changed, 13 insertions, 10 deletions
diff --git a/ci/prepare_env.sh b/ci/prepare_env.sh index 31a8e405b..8f9f58087 100755 --- a/ci/prepare_env.sh +++ b/ci/prepare_env.sh @@ -12,10 +12,12 @@ : ${INSTALLER_TYPE:='fuel'} : ${INSTALLER_IP:='10.20.0.2'} +: ${DEPLOY_TYPE:='bm'} # Can be any of 'bm' (Bare Metal) or 'virt' (Virtual) : ${NODE_NAME:='unknown'} : ${EXTERNAL_NETWORK:='admin_floating_net'} + # Extract network name from EXTERNAL_NETWORK # e.g. EXTERNAL_NETWORK='ext-net;flat;192.168.0.2;192.168.0.253;192.168.0.1;192.168.0.0/24' export EXTERNAL_NETWORK=$(echo $EXTERNAL_NETWORK | cut -f1 -d \;) @@ -26,19 +28,16 @@ echo "INFO: Creating openstack credentials .." # Create openstack credentials OPENRC=/home/opnfv/openrc if [ ! -f $OPENRC ]; then - - $RELENG_REPO_DIR/utils/fetch_os_creds.sh \ - -d $OPENRC \ - -i ${INSTALLER_TYPE} -a ${INSTALLER_IP} - - # Fuel virtual need a fix - if [ "$NODE_NAME" == "ericsson-virtual1" ]; then - echo "INFO: Changing: internalURL -> publicURL in openrc" - sed -i 's/internalURL/publicURL/' $OPENRC + if [ "$DEPLOY_TYPE" == "virt" ]; then + FETCH_CRED_ARG="-v -d $OPENRC -i ${INSTALLER_TYPE} -a ${INSTALLER_IP}" + else + FETCH_CRED_ARG="-d $OPENRC -i ${INSTALLER_TYPE} -a ${INSTALLER_IP}" fi + $RELENG_REPO_DIR/utils/fetch_os_creds.sh $FETCH_CRED_ARG + fi source $OPENRC -export EXTERNAL_NETWORK INSTALLER_TYPE NODE_NAME +export EXTERNAL_NETWORK INSTALLER_TYPE DEPLOY_TYPE NODE_NAME diff --git a/ci/yardstick-verify b/ci/yardstick-verify index c7b1cefec..c83193574 100755 --- a/ci/yardstick-verify +++ b/ci/yardstick-verify @@ -144,6 +144,10 @@ create_nova_flavor() echo "========== Create nova flavor ==========" # Create the nova flavor used by some sample test cases nova flavor-create yardstick-flavor 100 512 3 1 + # DPDK-enabled OVS requires guest memory to be backed by large pages + if [[ "$DEPLOY_SCENARIO" == *"-ovs-"* ]]; then + nova flavor-key yardstick-flavor set hw:mem_page_size=large + fi fi } |