CI: integration vm include IP address in name

- remove unnecessary `export`'s
- improve logging in script

Author: aramprice

ci/tasks/setup-integration-test-vm/run.sh

@@ -7,25 +7,19 @@ ROOT_DIR=$(pwd)
 export OUTPUT_DIR=${ROOT_DIR}/output
 
 VM_IP=$(cat nimbus-ips/name)
-CLONE_NAME_PREFIX="construct-${JOB_OS_NAME}-integration-ci-${OS_LINE}"
-CLONE_NAME_SUFFIX=$(echo "${VM_IP}" | cut -d . -f 4)
-CLONE_NAME=${CLONE_NAME_PREFIX}-${CLONE_NAME_SUFFIX}
-
-export VM_IP
-export CLONE_NAME_PREFIX
-export CLONE_NAME_SUFFIX
-export CLONE_NAME
 
+CLONE_NAME="stembuild-${JOB_OS_NAME}-${OS_LINE}-${VM_IP}"
 echo "${CLONE_NAME}" > integration-vm-name/name
-echo "Creating VM ${CLONE_NAME} with IP: ${VM_IP}"
 
+echo "Cloning ${BASE_VM_IPATH} to ${CLONE_NAME}"
 govc vm.clone \
   -vm "${BASE_VM_IPATH}" \
   -ds "${CLONE_DATASTORE}" \
   -pool "${CLONE_RESOURCE_POOL}" \
   -folder "${CLONE_FOLDER}" \
   -on=false "${CLONE_NAME}"
 
+echo "Customizing ${CLONE_NAME}"
 govc vm.customize \
   -vm.ipath "${CLONE_FOLDER}"/"${CLONE_NAME}" \
   -ip "${VM_IP}" \
@@ -36,7 +30,7 @@ govc vm.customize \
 govc vm.power -on \
   -vm.ipath "${CLONE_FOLDER}"/"${CLONE_NAME}"
 
-echo Waiting for VM to be configured with expected IP address...
+echo "Waiting 10 min for ${CLONE_NAME} to be configured with ${VM_IP}"
 SECONDS=0
 FOUND_IP_ADDRESS=
 
@@ -47,7 +41,7 @@ while [ "${VM_IP}" != "${FOUND_IP_ADDRESS}" ]; do
 	FOUND_IP_ADDRESS=$(echo "${VM_INFO}" |
 	    jq -r ".virtualMachines[0].guest.net[0].ipAddress | .[]? |select(. == \"${VM_IP}\")")
 
-    echo "Current IP Addresses:"
+  echo "Current IP Addresses:"
 	echo "${VM_INFO}" | jq -r ".virtualMachines[0].guest.net[0].ipAddress | .[]?"
 
 	if [ ${SECONDS} -gt 600 ] ; then