summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rwxr-xr-xtests/ci/prepare_env.sh14
-rwxr-xr-xtests/ci/yardstick-verify51
2 files changed, 37 insertions, 28 deletions
diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index bbd7b5553..9c949ec4f 100755
--- a/tests/ci/prepare_env.sh
+++ b/tests/ci/prepare_env.sh
@@ -15,7 +15,6 @@
: ${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 \;)
@@ -75,6 +74,13 @@ verify_connectivity() {
error "Can not talk to $ip."
}
+YARD_IMG_ARCH=amd64
+export YARD_IMG_ARCH
+
+if ! grep -q "Defaults env_keep += \"YARD_IMG_ARCH\"" "/etc/sudoers"; then
+ sudo echo "Defaults env_keep += \"YARD_IMG_ARCH YARDSTICK_REPO_DIR\"" >> /etc/sudoers
+fi
+
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
if [ "$INSTALLER_TYPE" == "fuel" ]; then
@@ -85,13 +91,7 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then
root@${INSTALLER_IP}:~/.ssh/id_rsa /root/.ssh/id_rsa &> /dev/null
ARCH_SCRIPT="test -f /etc/fuel_openstack_arch && grep -q arm64 /etc/fuel_openstack_arch"
- YARD_IMG_ARCH=amd64
sshpass -p r00tme ssh $ssh_options -l root $INSTALLER_IP "${ARCH_SCRIPT}" && YARD_IMG_ARCH=arm64
- export YARD_IMG_ARCH
-
- if ! grep -q "Defaults env_keep += \"YARD_IMG_ARCH\"" "/etc/sudoers"; then
- sudo echo "Defaults env_keep += \"YARD_IMG_ARCH YARDSTICK_REPO_DIR\"" >> /etc/sudoers
- fi
sshpass -p r00tme ssh 2>/dev/null $ssh_options \
root@${INSTALLER_IP} fuel node>fuel_node
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify
index 8670bf4d0..37d0a9036 100755
--- a/tests/ci/yardstick-verify
+++ b/tests/ci/yardstick-verify
@@ -197,7 +197,7 @@ load_cirros_image()
output=$(glance image-create \
--name cirros-0.3.3 \
- --disk-format qcow2 \
+ --disk-format $DISK_FORMAT \
--container-format bare \
--file $image_file)
echo "$output"
@@ -270,12 +270,6 @@ load_yardstick_image()
cd $YARDSTICK_REPO_DIR
fi
- if [ "$DEPLOY_SCENARIO" == "os-nosdn-lxd-ha" -o "$DEPLOY_SCENARIO" == "os-nosdn-lxd-noha" ]; then
- DISK_FORMAT="raw"
- else
- DISK_FORMAT="qcow2"
- fi
-
output=$(eval glance --os-image-api-version 1 image-create \
--name yardstick-trusty-server \
--is-public true --disk-format $DISK_FORMAT \
@@ -297,6 +291,26 @@ load_yardstick_image()
echo "Glance image id: $GLANCE_IMAGE_ID"
}
+report(){
+
+ echo
+ echo "========== Reporting Status =========="
+
+ curl -i -H 'content-type: application/json' -X POST -d \
+ "{\"project_name\": \"yardstick\",
+ \"case_name\": \"scenario_status\",
+ \"pod_name\":\"${NODE_NAME}\",
+ \"installer\":\"${INSTALLER_TYPE}\",
+ \"version\":\"${YARDSTICK_BRANCH}\",
+ \"scenario\":\"${DEPLOY_SCENARIO}\",
+ \"description\": \"yardstick ci scenario status\",
+ \"start_date\":\"$2\",
+ \"criteria\":\"$1\",
+ \"stop_date\":\"$3\",
+ \"details\":\"\"}" \
+ ${DISPATCHER_HTTP_TARGET}
+}
+
run_test()
{
echo
@@ -341,7 +355,7 @@ EOF
# Mark the test suite failed but continue
# running the remaining test suites.
- (( failed++ ))
+ (( ++failed ))
fi
if [ ${DISPATCHER_TYPE} = file ]; then
echo "---------------------------"
@@ -363,19 +377,8 @@ EOF
if [ $failed -gt 0 ]; then
scenario_status="FAILED"
fi
- curl -i -H 'content-type: application/json' -X POST -d \
- "{\"project_name\": \"yardstick\",
- \"case_name\": \"scenario_status\",
- \"pod_name\":\"${NODE_NAME}\",
- \"installer\":\"${INSTALLER_TYPE}\",
- \"version\":\"${YARDSTICK_BRANCH}\",
- \"scenario\":\"${DEPLOY_SCENARIO}\",
- \"description\": \"yardstick ci scenario status\",
- \"start_date\":\"${start_date}\",
- \"criteria\":\"${scenario_status}\",
- \"stop_date\":\"${stop_date}\",
- \"details\":\"\"}" \
- ${DISPATCHER_HTTP_TARGET}
+
+ report $scenario_status $start_date $stop_date
if [ $failed -gt 0 ]; then
echo "---------------------------"
@@ -479,6 +482,12 @@ main()
QCOW_IMAGE="/tmp/workspace/yardstick/yardstick-trusty-server.img"
+ if [ "$DEPLOY_SCENARIO" == "os-nosdn-lxd-ha" -o "$DEPLOY_SCENARIO" == "os-nosdn-lxd-noha" ]; then
+ DISK_FORMAT="raw"
+ else
+ DISK_FORMAT="qcow2"
+ fi
+
build_yardstick_image
load_yardstick_image
if [ $YARD_IMG_ARCH = "arm64" ]; then