diff options
Diffstat (limited to 'tests/ci')
| -rwxr-xr-x | tests/ci/prepare_env.sh | 57 | ||||
| -rwxr-xr-x | tests/ci/prepare_storperf_admin-rc.sh | 5 |
2 files changed, 20 insertions, 42 deletions
diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh index caef8acce..a097cec69 100755 --- a/tests/ci/prepare_env.sh +++ b/tests/ci/prepare_env.sh @@ -19,7 +19,8 @@ # 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 \;) +EXTERNAL_NETWORK=$(echo ${EXTERNAL_NETWORK} | cut -f1 -d \;) +export EXTERNAL_NETWORK # Create openstack credentials echo "INFO: Creating openstack credentials .." @@ -28,44 +29,22 @@ OPENRC=/etc/yardstick/openstack.creds INSTALLERS=(apex compass fuel joid) RC_VAR_EXIST=false -if [ "${OS_AUTH_URL}" -a "${OS_USERNAME}" -a "${OS_PASSWORD}" -a "${EXTERNAL_NETWORK}" ];then +if [[ "${OS_AUTH_URL}" && "${OS_USERNAME}" && "${OS_PASSWORD}" && "${EXTERNAL_NETWORK}" ]];then RC_VAR_EXIST=true fi -if [ "${RC_VAR_EXIST}" = false ]; then - if [ ! -f $OPENRC ];then - # credentials file is not given, check if environment variables are set - # to get the creds using fetch_os_creds.sh later on - echo "INFO: Checking environment variables INSTALLER_TYPE and INSTALLER_IP" - if [ -z ${INSTALLER_TYPE} ]; then - echo "environment variable 'INSTALLER_TYPE' is not defined." - exit 1 - elif [[ ${INSTALLERS[@]} =~ ${INSTALLER_TYPE} ]]; then - echo "INSTALLER_TYPE env variable found: ${INSTALLER_TYPE}" - else - echo "Invalid env variable INSTALLER_TYPE=${INSTALLER_TYPE}" - exit 1 - fi - - 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 +if [[ "${RC_VAR_EXIST}" = false && -f ${OPENRC} ]]; then + . ${OPENRC} fi export EXTERNAL_NETWORK INSTALLER_TYPE DEPLOY_TYPE NODE_NAME # Prepare a admin-rc file for StorPerf integration -$YARDSTICK_REPO_DIR/tests/ci/prepare_storperf_admin-rc.sh +"${YARDSTICK_REPO_DIR}"/tests/ci/prepare_storperf_admin-rc.sh # copy Storperf related files to the deployment location if [ "$INSTALLER_TYPE" == "compass" ]; then - source $YARDSTICK_REPO_DIR/tests/ci/scp_storperf_files.sh + . "${YARDSTICK_REPO_DIR}"/tests/ci/scp_storperf_files.sh fi # Fetching id_rsa file from jump_server..." @@ -73,7 +52,7 @@ verify_connectivity() { local ip=$1 echo "Verifying connectivity to $ip..." for i in $(seq 0 10); do - if ping -c 1 -W 1 $ip > /dev/null; then + if ping -c 1 -W 1 "${ip}" > /dev/null; then echo "$ip is reachable!" return 0 fi @@ -87,34 +66,34 @@ ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" if [ "$INSTALLER_TYPE" == "fuel" ]; then # check the connection - verify_connectivity $INSTALLER_IP + verify_connectivity "${INSTALLER_IP}" pod_yaml="$YARDSTICK_REPO_DIR/etc/yardstick/nodes/fuel_baremetal/pod.yaml" # update "ip" according to the CI env - ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \ + ssh -l ubuntu "${INSTALLER_IP}" -i ${SSH_KEY} ${ssh_options} \ "sudo salt -C 'ctl* or cmp*' grains.get fqdn_ip4 --out yaml">node_info - controller_ips=($(cat node_info|awk '/ctl/{getline; print $2}')) - compute_ips=($(cat node_info|awk '/cmp/{getline; print $2}')) + controller_ips=($(awk '/ctl/{getline; print $2}' < node_info)) + compute_ips=($(awk '/cmp/{getline; print $2}' < node_info)) if [[ ${controller_ips[0]} ]]; then - sed -i "s|ip1|${controller_ips[0]}|" $pod_yaml; + sed -i "s|ip1|${controller_ips[0]}|" "${pod_yaml}" fi if [[ ${controller_ips[1]} ]]; then - sed -i "s|ip2|${controller_ips[1]}|" $pod_yaml; + sed -i "s|ip2|${controller_ips[1]}|" "${pod_yaml}" fi if [[ ${controller_ips[2]} ]]; then - sed -i "s|ip3|${controller_ips[2]}|" $pod_yaml; + sed -i "s|ip3|${controller_ips[2]}|" "${pod_yaml}" fi if [[ ${compute_ips[0]} ]]; then - sed -i "s|ip4|${compute_ips[0]}|" $pod_yaml; + sed -i "s|ip4|${compute_ips[0]}|" "${pod_yaml}" fi if [[ ${compute_ips[1]} ]]; then - sed -i "s|ip5|${compute_ips[1]}|" $pod_yaml; + sed -i "s|ip5|${compute_ips[1]}|" "${pod_yaml}" fi # update 'user' and 'key_filename' according to the CI env - sed -i "s|node_username|${USER_NAME}|;s|node_keyfile|${SSH_KEY}|" $pod_yaml; + sed -i "s|node_username|${USER_NAME}|;s|node_keyfile|${SSH_KEY}|" "${pod_yaml}" fi diff --git a/tests/ci/prepare_storperf_admin-rc.sh b/tests/ci/prepare_storperf_admin-rc.sh index 558375e62..ef7c2297e 100755 --- a/tests/ci/prepare_storperf_admin-rc.sh +++ b/tests/ci/prepare_storperf_admin-rc.sh @@ -15,8 +15,9 @@ AUTH_URL=${OS_AUTH_URL} USERNAME=${OS_USERNAME:-admin} PASSWORD=${OS_PASSWORD:-console} +# OS_TENANT_NAME is still present to keep backward compatibility with legacy +# deployments, but should be replaced by OS_PROJECT_NAME. TENANT_NAME=${OS_TENANT_NAME:-admin} -TENANT_ID=`openstack project show admin|grep '\bid\b' |awk -F '|' '{print $3}'|sed -e 's/^[[:space:]]*//'` PROJECT_NAME=${OS_PROJECT_NAME:-$TENANT_NAME} PROJECT_ID=`openstack project show admin|grep '\bid\b' |awk -F '|' '{print $3}'|sed -e 's/^[[:space:]]*//'` @@ -30,8 +31,6 @@ echo "OS_USERNAME="$USERNAME >> ~/storperf_admin-rc echo "OS_PASSWORD="$PASSWORD >> ~/storperf_admin-rc echo "OS_PROJECT_NAME="$PROJECT_NAME >> ~/storperf_admin-rc echo "OS_PROJECT_ID="$PROJECT_ID >> ~/storperf_admin-rc -echo "OS_TENANT_NAME="$TENANT_NAME >> ~/storperf_admin-rc -echo "OS_TENANT_ID="$TENANT_ID >> ~/storperf_admin-rc echo "OS_USER_DOMAIN_ID="$USER_DOMAIN_ID >> ~/storperf_admin-rc echo "OS_PROJECT_DOMAIN_NAME="$OS_PROJECT_DOMAIN_NAME >> ~/storperf_admin-rc echo "OS_USER_DOMAIN_NAME="$OS_USER_DOMAIN_NAME >> ~/storperf_admin-rc |