summaryrefslogtreecommitdiffstats
path: root/tests/ci
diff options
context:
space:
mode:
Diffstat (limited to 'tests/ci')
-rwxr-xr-xtests/ci/load_images.sh54
-rwxr-xr-xtests/ci/prepare_env.sh26
-rwxr-xr-xtests/ci/yardstick-verify8
3 files changed, 33 insertions, 55 deletions
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index c2ae4fe7b..e73d7e800 100755
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -13,17 +13,21 @@
set -e
YARD_IMG_ARCH=amd64
-export YARD_IMG_ARCH
if ! grep -q "Defaults env_keep += \"YARD_IMG_ARCH\"" "/etc/sudoers"; then
echo "Defaults env_keep += \"YARD_IMG_ARCH YARDSTICK_REPO_DIR\"" | sudo tee -a /etc/sudoers
fi
# Look for a compute node, that is online, and check if it is aarch64
-ARCH_SCRIPT="ssh \$(fuel2 node list | awk -F'|' '\$6 ~ /compute/ && \$11 ~ /rue/ {print \$7; exit;}') uname -m 2>/dev/null | grep -q aarch64"
-if [ "$INSTALLER_TYPE" == "fuel" ]; then
- sshpass -p r00tme ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -l root "${INSTALLER_IP}" "${ARCH_SCRIPT}" && YARD_IMG_ARCH=arm64
+if [ "${INSTALLER_TYPE}" == 'fuel' ]; then
+ ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+ COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \
+ "sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'")
+ if [ "${COMPUTE_ARCH}" == 'aarch64' ]; then
+ YARD_IMG_ARCH=arm64
+ fi
fi
+export YARD_IMG_ARCH
HW_FW_TYPE=""
if [ "${YARD_IMG_ARCH}" == "arm64" ]; then
@@ -78,35 +82,8 @@ load_yardstick_image()
echo
echo "========== Loading yardstick cloud image =========="
EXTRA_PARAMS=""
- if [[ "${YARD_IMG_ARCH}" == "arm64" && "${YARD_IMG_AKI}" == "true" ]]; then
- CLOUD_IMAGE="/tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.tar.gz"
- CLOUD_KERNEL="/tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}-vmlinuz-generic"
- cd /tmp
- if [ ! -f "${CLOUD_IMAGE}" ]; then
- wget "${CLOUD_IMG_URL}"
- fi
- if [ ! -f "${CLOUD_KERNEL}" ]; then
- tar xf "${CLOUD_IMAGE}" "${CLOUD_KERNEL##**/}"
- fi
- create_kernel=$(openstack ${SECURE} image create \
- --public \
- --disk-format qcow2 \
- --container-format bare \
- --file ${CLOUD_KERNEL} \
- yardstick-${release}-kernel)
-
- GLANCE_KERNEL_ID=$(echo "$create_kernel" | awk '/ id / {print $(NF-1)}')
- if [ -z "$GLANCE_KERNEL_ID" ]; then
- echo 'Failed uploading kernel to cloud'.
- exit 1
- fi
-
- command_line="root=/dev/vdb1 console=tty0 console=ttyS0 console=ttyAMA0 rw"
-
- EXTRA_PARAMS="--property kernel_id=$GLANCE_KERNEL_ID --property os_command_line=\"$command_line\""
-
- rm -f -- "${CLOUD_KERNEL}" "${CLOUD_IMAGE}"
- cd "${YARDSTICK_REPO_DIR}"
+ if [[ "${YARD_IMG_ARCH}" == "arm64" ]]; then
+ EXTRA_PARAMS="--property hw_video_model=vga"
fi
# VPP requires guest memory to be backed by large pages
@@ -150,9 +127,11 @@ load_yardstick_image()
load_cirros_image()
{
+ EXTRA_PARAMS=""
if [[ "${YARD_IMG_ARCH}" == "arm64" ]]; then
CIRROS_IMAGE_VERSION="cirros-d161201"
CIRROS_IMAGE_PATH="/home/opnfv/images/cirros-d161201-aarch64-disk.img"
+ EXTRA_PARAMS="--property hw_video_model=vga --property short_id=ubuntu16.04"
else
CIRROS_IMAGE_VERSION="Cirros-0.3.5"
CIRROS_IMAGE_PATH="/home/opnfv/images/cirros-0.3.5-x86_64-disk.img"
@@ -166,12 +145,15 @@ load_cirros_image()
local image_file="${CIRROS_IMAGE_PATH}"
- EXTRA_PARAMS=""
# VPP requires guest memory to be backed by large pages
if [[ "$DEPLOY_SCENARIO" == *"-fdio-"* ]]; then
EXTRA_PARAMS=$EXTRA_PARAMS" --property hw_mem_page_size=large"
fi
+ if [[ -n "${HW_FW_TYPE}" ]]; then
+ EXTRA_PARAMS=$EXTRA_PARAMS" --property hw_firmware_type=${HW_FW_TYPE}"
+ fi
+
output=$(openstack ${SECURE} image create \
--disk-format qcow2 \
--container-format bare \
@@ -267,16 +249,14 @@ main()
build_yardstick_image
load_yardstick_image
if [ "${YARD_IMG_ARCH}" == "arm64" ]; then
- sed -i 's/image: {{image}}/image: TestVM/g' tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml
- sed -i 's/image: cirros-0.3.5/image: TestVM/g' samples/ping.yaml
#We have overlapping IP with the real network
for filename in tests/opnfv/test_cases/*; do
sed -i "s/cidr: '10.0.1.0\/24'/cidr: '10.3.1.0\/24'/g" "${filename}"
done
else
- load_cirros_image
load_ubuntu_image
fi
+ load_cirros_image
create_nova_flavor
}
diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index c3ee4c76b..44e2694f7 100755
--- a/tests/ci/prepare_env.sh
+++ b/tests/ci/prepare_env.sh
@@ -85,36 +85,32 @@ ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
if [ "$INSTALLER_TYPE" == "fuel" ]; then
#ip_fuel="10.20.0.2"
verify_connectivity $INSTALLER_IP
- echo "Fetching id_rsa file from jump_server $INSTALLER_IP..."
- sshpass -p r00tme scp 2>/dev/null $ssh_options \
- root@${INSTALLER_IP}:~/.ssh/id_rsa /root/.ssh/id_rsa &> /dev/null
- sshpass -p r00tme ssh 2>/dev/null $ssh_options \
- root@${INSTALLER_IP} fuel node>fuel_node
+ ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \
+ "sudo salt -C 'ctl* or cmp*' grains.get fqdn_ip4 --out yaml">node_info
- # update fuel node id and ip info according to the CI env
- controller_IDs=($(cat fuel_node|grep controller|awk '{print $1}'))
- compute_IDs=($(cat fuel_node|grep compute|awk '{print $1}'))
- controller_ips=($(cat fuel_node|grep controller|awk '{print $10}'))
- compute_ips=($(cat fuel_node|grep compute|awk '{print $10}'))
+ # update node ip info according to the CI env
+ controller_ips=($(cat node_info|awk '/ctl/{getline; print $2}'))
+ compute_ips=($(cat node_info|awk '/cmp/{getline; print $2}'))
pod_yaml="./etc/yardstick/nodes/fuel_baremetal/pod.yaml"
node_line_num=($(grep -n node[1-5] $pod_yaml | awk -F: '{print $1}'))
+ node_ID=0;
if [[ ${controller_ips[0]} ]]; then
- sed -i "${node_line_num[0]}s/node1/node${controller_IDs[0]}/;s/ip1/${controller_ips[0]}/" $pod_yaml;
+ sed -i "${node_line_num[0]}s/node1/node$((++node_ID))/;s/ip1/${controller_ips[0]}/" $pod_yaml;
fi
if [[ ${controller_ips[1]} ]]; then
- sed -i "${node_line_num[1]}s/node2/node${controller_IDs[1]}/;s/ip2/${controller_ips[1]}/" $pod_yaml;
+ sed -i "${node_line_num[1]}s/node2/node$((++node_ID))/;s/ip2/${controller_ips[1]}/" $pod_yaml;
fi
if [[ ${controller_ips[2]} ]]; then
- sed -i "${node_line_num[2]}s/node3/node${controller_IDs[2]}/;s/ip3/${controller_ips[2]}/" $pod_yaml;
+ sed -i "${node_line_num[2]}s/node3/node$((++node_ID))/;s/ip3/${controller_ips[2]}/" $pod_yaml;
fi
if [[ ${compute_ips[0]} ]]; then
- sed -i "${node_line_num[3]}s/node4/node${compute_IDs[0]}/;s/ip4/${compute_ips[0]}/" $pod_yaml;
+ sed -i "${node_line_num[3]}s/node4/node$((++node_ID))/;s/ip4/${compute_ips[0]}/" $pod_yaml;
fi
if [[ ${compute_ips[1]} ]]; then
- sed -i "${node_line_num[4]}s/node5/node${compute_IDs[1]}/;s/ip5/${compute_ips[1]}/" $pod_yaml;
+ sed -i "${node_line_num[4]}s/node5/node$((++node_ID))/;s/ip5/${compute_ips[1]}/" $pod_yaml;
fi
fi
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify
index ca8a0b27a..d1174825f 100755
--- a/tests/ci/yardstick-verify
+++ b/tests/ci/yardstick-verify
@@ -87,7 +87,9 @@ error_exit()
exitcode=$rc
fi
- cleanup
+ if [[ "${DEPLOY_SCENARIO:0:2}" == 'os' ]];then
+ source "${YARDSTICK_REPO_DIR}/tests/ci/clean_images.sh"
+ fi
echo "Exiting with RC=$exitcode"
@@ -207,10 +209,10 @@ EOF
- local scenario_status="SUCCESS"
+ local scenario_status="PASS"
if [ $failed -gt 0 ]; then
- scenario_status="FAILED"
+ scenario_status="FAIL"
fi
report "${scenario_status}" "${start_date}" "${stop_date}"