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

Gather compose log/metadata for AWS/qemu test

Browse source 
Gather logs directly for AWS + qemu tests using `composer-cli compose
log` and also gather the metadata. This will hopefully help diagnost the
problems we are seeing in #754.

Signed-off-by: Major Hayden <major@redhat.com>
This commit is contained in:
Major Hayden 2020-06-10 16:06:41 -05:00 • committed by Major Hayden
parent 71c4dd2c20
commit 3d488385ff
2 changed files with 52 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -69,6 +69,32 @@ smoke_test_check () {
fi
}
# Get the compose log.
get_compose_log () {
COMPOSE_ID=$1
LOG_FILE=${WORKSPACE}/osbuild-${ID}-${VERSION_ID}-aws.log
# Download the logs.
sudo composer-cli compose log $COMPOSE_ID | tee $LOG_FILE > /dev/null
}
# Get the compose metadata.
get_compose_metadata () {
COMPOSE_ID=$1
METADATA_FILE=${WORKSPACE}/osbuild-${ID}-${VERSION_ID}-aws.log
# Download the metadata.
sudo composer-cli compose metadata $COMPOSE_ID > /dev/null
# Find the tarball and extract it.
TARBALL=$(basename $(find . -maxdepth 1 -type f -name "*-metadata.tar"))
tar -xf $TARBALL
rm -f $TARBALL
# Move the JSON file into place.
cat ${COMPOSE_ID}.json | jq -M '.' | tee $METADATA_FILE > /dev/null
}
# Get the console screenshot from the AWS instance.
store_instance_screenshot () {
INSTANCE_ID=${1}
@ -143,6 +169,11 @@ while true; do
sleep 30
done
# Capture the compose logs from osbuild.
greenprint "💬 Getting compose log and metadata"
get_compose_log $COMPOSE_ID
get_compose_metadata $COMPOSE_ID
# Did the compose finish with success?
if [[ $COMPOSE_STATUS != FINISHED ]]; then
echo "Something went wrong with the compose. 😢"

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

@ -92,22 +92,30 @@ smoke_test_check () {
fi
}
# Get the compose logs and store them as artifacts.
get_compose_logs () {
# Get the compose log.
get_compose_log () {
COMPOSE_ID=$1
LOG_FILE=${WORKSPACE}/osbuild-${ID}-${VERSION_ID}-aws.log
# Download the logs.
sudo composer-cli compose logs $COMPOSE_ID
sudo composer-cli compose log $COMPOSE_ID | tee $LOG_FILE > /dev/null
}
# Find the log tarball and extract it.
LOG_TAR=$(basename $(find . -maxdepth 1 -type f -name "*logs.tar"))
tar xf $LOG_TAR
# Get the compose metadata.
get_compose_metadata () {
COMPOSE_ID=$1
METADATA_FILE=${WORKSPACE}/osbuild-${ID}-${VERSION_ID}-aws.log
# Move the log into the workspace so it can be artifacted.
mv logs/osbuild.log ${WORKSPACE}/osbuild-${ID}-${VERSION_ID}-${IMAGE_TYPE}.log
# Download the metadata.
sudo composer-cli compose metadata $COMPOSE_ID > /dev/null
# Clean up.
rm -rf $LOG_TAR logs
# Find the tarball and extract it.
TARBALL=$(basename $(find . -maxdepth 1 -type f -name "*-metadata.tar"))
tar -xf $TARBALL
rm -f $TARBALL
# Move the JSON file into place.
cat ${COMPOSE_ID}.json | jq -M '.' | tee $METADATA_FILE > /dev/null
}
# Write a basic blueprint for our image.
@ -170,8 +178,9 @@ while true; do
done
# Capture the compose logs from osbuild.
greenprint "💬 Getting logs for compose"
get_compose_logs $COMPOSE_ID
greenprint "💬 Getting compose log and metadata"
get_compose_log $COMPOSE_ID
get_compose_metadata $COMPOSE_ID
# Did the compose finish with success?
if [[ $COMPOSE_STATUS != FINISHED ]]; then