diff options
Diffstat (limited to 'tests/ci')
| -rwxr-xr-x | tests/ci/load_images.sh | 3 | ||||
| -rwxr-xr-x | tests/ci/prepare_env.sh | 14 | ||||
| -rwxr-xr-x | tests/ci/yardstick-verify | 4 |
3 files changed, 15 insertions, 6 deletions
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh index caaba9e8b..5df769c0d 100755 --- a/tests/ci/load_images.sh +++ b/tests/ci/load_images.sh @@ -67,6 +67,7 @@ build_yardstick_image() cd ${ANSIBLE_SCRIPTS} &&\ ansible-playbook \ -e img_property="normal" \ + -e YARD_IMG_ARCH=${YARD_IMG_ARCH} \ -vvv -i inventory.ini build_yardstick_image.yml if [ ! -f "${QCOW_IMAGE}" ]; then @@ -250,7 +251,7 @@ main() load_yardstick_image if [ "${YARD_IMG_ARCH}" == "arm64" ]; then #We have overlapping IP with the real network - for filename in tests/opnfv/test_cases/*; do + for filename in ${YARDSTICK_REPO_DIR}/tests/opnfv/test_cases/*; do sed -i "s/cidr: '10.0.1.0\/24'/cidr: '10.3.1.0\/24'/g" "${filename}" done else diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh index 886e50e21..d7c60d48f 100755 --- a/tests/ci/prepare_env.sh +++ b/tests/ci/prepare_env.sh @@ -72,10 +72,12 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then # update "ip" according to the CI env ssh -l ubuntu "${INSTALLER_IP}" -i ${SSH_KEY} ${ssh_options} \ - "sudo salt -C 'ctl* or cmp*' grains.get fqdn_ip4 --out yaml">node_info + "sudo salt -C 'ctl* or cmp* or odl01* or gtw*' grains.get fqdn_ip4 --out yaml">node_info - controller_ips=($(awk '/ctl/{getline; print $2} < node_info')) - compute_ips=($(awk '/cmp/{getline; print $2} < node_info')) + controller_ips=($(awk '/ctl/{getline; print $2}' < node_info)) + compute_ips=($(awk '/cmp/{getline; print $2}' < node_info)) + odl_ip=($(awk '/odl01/{getline; print $2}' < node_info)) + gateway_ip=($(awk '/gtw/{getline; print $2}' < node_info)) if [[ ${controller_ips[0]} ]]; then sed -i "s|ip1|${controller_ips[0]}|" "${pod_yaml}" @@ -92,6 +94,12 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then if [[ ${compute_ips[1]} ]]; then sed -i "s|ip5|${compute_ips[1]}|" "${pod_yaml}" fi + if [[ ${odl_ip[0]} ]]; then + sed -i "s|ip6|${odl_ip[0]}|" "${pod_yaml}" + fi + if [[ ${gateway_ip[0]} ]]; then + sed -i "s|ip7|${gateway_ip[0]}|" "${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}" diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify index d1174825f..34423ff2f 100755 --- a/tests/ci/yardstick-verify +++ b/tests/ci/yardstick-verify @@ -106,7 +106,7 @@ install_storperf() echo echo "========== Installing storperf ==========" - if ! yardstick -d plugin install plugin/CI/storperf.yaml; then + if ! yardstick -d plugin install ${YARDSTICK_REPO_DIR}/plugin/CI/storperf.yaml; then echo "Install storperf plugin FAILED"; exit 1 fi @@ -121,7 +121,7 @@ remove_storperf() echo echo "========== Removing storperf ==========" - if ! yardstick -d plugin remove plugin/CI/storperf.yaml; then + if ! yardstick -d plugin remove ${YARDSTICK_REPO_DIR}/plugin/CI/storperf.yaml; then echo "Remove storperf plugin FAILED"; exit 1 fi |