particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup integration tests

Browse source 
* Ensure we get the output of `composer-cli compose start` for
  diagnostics
* Hide the annoying `genisoimage` output
* Simplify the `IMAGE_EXTENSION` check
* Make it more clear what is happening while we wait for ssh

Signed-off-by: Major Hayden <major@redhat.com>
This commit is contained in:
Major Hayden 2020-06-10 11:50:17 -05:00 • committed by Major Hayden
parent 130c4b80a2
commit 71c4dd2c20
2 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
test/image-tests/aws.sh
View file

@ -125,7 +125,7 @@ WORKER_JOURNAL_PID=$!
# Start the compose and upload to AWS. # Start the compose and upload to AWS.
greenprint "🚀 Starting compose" greenprint "🚀 Starting compose"
sudo composer-cli --json compose start bash ami $IMAGE_KEY $AWS_CONFIG | tee $COMPOSE_START > /dev/null sudo composer-cli --json compose start bash ami $IMAGE_KEY $AWS_CONFIG | tee $COMPOSE_START
COMPOSE_ID=$(jq -r '.build_id' $COMPOSE_START) COMPOSE_ID=$(jq -r '.build_id' $COMPOSE_START)
# Wait for the compose to finish. # Wait for the compose to finish.
@ -216,16 +216,19 @@ PUBLIC_IP=$(jq -r '.Reservations[].Instances[].PublicIpAddress' $INSTANCE_DATA)
# Wait for the node to come online. # Wait for the node to come online.
greenprint "⏱ Waiting for AWS instance to respond to ssh" greenprint "⏱ Waiting for AWS instance to respond to ssh"
for LOOP_COUNTER in {0..30}; do for LOOP_COUNTER in {0..30}; do
if ssh-keyscan $PUBLIC_IP; then if ssh-keyscan $PUBLIC_IP 2>&1 > /dev/null; then
ssh-keyscan $PUBLIC_IP >> ~/.ssh/known_hosts echo "SSH is up!"
break ssh-keyscan $PUBLIC_IP >> ~/.ssh/known_hosts
break
fi fi
# Get a screenshot of the instance console. # Get a screenshot of the instance console.
echo "Getting instance screenshot..."
store_instance_screenshot $INSTANCE_ID $LOOP_COUNTER || true store_instance_screenshot $INSTANCE_ID $LOOP_COUNTER || true
# ssh-keyscan has a 5 second timeout by default, so the pause per loop # ssh-keyscan has a 5 second timeout by default, so the pause per loop
# is 10 seconds when you include the following `sleep`. # is 10 seconds when you include the following `sleep`.
echo "Retrying in 5 seconds..."
sleep 5 sleep 5
done done

15
test/image-tests/qemu.sh
View file

@ -9,10 +9,9 @@ source /etc/os-release
IMAGE_TYPE=${1:-qcow2} IMAGE_TYPE=${1:-qcow2}
# Select the file extension based on the image that we are building. # Select the file extension based on the image that we are building.
IMAGE_EXTENSION=$IMAGE_TYPE
if [[ $IMAGE_TYPE == 'openstack' ]]; then if [[ $IMAGE_TYPE == 'openstack' ]]; then
IMAGE_EXTENSION=qcow2 IMAGE_EXTENSION=qcow2
else
IMAGE_EXTENSION=$IMAGE_TYPE
fi fi
# RHEL 8 cannot boot a VMDK using libvirt. See BZ 999789. # RHEL 8 cannot boot a VMDK using libvirt. See BZ 999789.
@ -152,7 +151,7 @@ WORKER_JOURNAL_PID=$!
# Start the compose # Start the compose
greenprint "🚀 Starting compose" greenprint "🚀 Starting compose"
sudo composer-cli --json compose start bash $IMAGE_TYPE | tee $COMPOSE_START > /dev/null sudo composer-cli --json compose start bash $IMAGE_TYPE | tee $COMPOSE_START
COMPOSE_ID=$(jq -r '.build_id' $COMPOSE_START) COMPOSE_ID=$(jq -r '.build_id' $COMPOSE_START)
# Wait for the compose to finish. # Wait for the compose to finish.
@ -194,7 +193,7 @@ sudo mv $IMAGE_FILENAME $LIBVIRT_IMAGE_PATH
greenprint "💿 Creating a cloud-init ISO" greenprint "💿 Creating a cloud-init ISO"
CLOUD_INIT_PATH=/var/lib/libvirt/images/seed.iso CLOUD_INIT_PATH=/var/lib/libvirt/images/seed.iso
cp ${WORKSPACE}/test/cloud-init/*-data . cp ${WORKSPACE}/test/cloud-init/*-data .
sudo genisoimage -o $CLOUD_INIT_PATH -V cidata -r -J user-data meta-data > /dev/null sudo genisoimage -o $CLOUD_INIT_PATH -V cidata -r -J user-data meta-data 2>&1 > /dev/null
# Ensure SELinux is happy with our new images. # Ensure SELinux is happy with our new images.
greenprint "👿 Running restorecon on image directory" greenprint "👿 Running restorecon on image directory"
@ -232,13 +231,15 @@ done
# Wait for SSH to start. # Wait for SSH to start.
greenprint "⏱ Waiting for instance to respond to ssh" greenprint "⏱ Waiting for instance to respond to ssh"
for LOOP_COUNTER in {0..30}; do for LOOP_COUNTER in {0..30}; do
if ssh-keyscan $INSTANCE_ADDRESS > /dev/null; then if ssh-keyscan $INSTANCE_ADDRESS 2>&1 > /dev/null; then
ssh-keyscan $INSTANCE_ADDRESS >> ~/.ssh/known_hosts echo "SSH is up!"
break ssh-keyscan $INSTANCE_ADDRESS >> ~/.ssh/known_hosts
break
fi fi
# ssh-keyscan has a 5 second timeout by default, so the pause per loop # ssh-keyscan has a 5 second timeout by default, so the pause per loop
# is 10 seconds when you include the following `sleep`. # is 10 seconds when you include the following `sleep`.
echo "Retrying in 5 seconds..."
sleep 5 sleep 5
done done