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

rhel90: fix libvirt_test

Browse source 
Test was adapted to both weldr-client and composer-cli
This commit is contained in:
Diaa Sami 2021-08-26 14:52:08 +02:00 • committed by Ondřej Budai
parent 839a708755
commit 66a6e4de8c
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitlab-ci.yml
View file

@ -244,6 +244,7 @@ Integration:
RUNNER: RUNNER:
- aws/rhel-8-x86_64 - aws/rhel-8-x86_64
- openstack/rhel-8.5-x86_64 - openstack/rhel-8.5-x86_64
- openstack/rhel-9.0-beta-nightly-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
- SCRIPT: - SCRIPT:
- aws.sh - aws.sh

12
tools/libvirt_test.sh
View file

@ -149,13 +149,21 @@ trap 'sudo pkill -P ${WORKER_JOURNAL_PID}' EXIT
# Start the compose # Start the compose
greenprint "🚀 Starting compose" greenprint "🚀 Starting compose"
sudo composer-cli --json compose start bp "$IMAGE_TYPE" | tee "$COMPOSE_START" sudo composer-cli --json compose start bp "$IMAGE_TYPE" | tee "$COMPOSE_START"
COMPOSE_ID=$(jq -r '.build_id' "$COMPOSE_START") if rpm -q --quiet weldr-client; then
COMPOSE_ID=$(jq -r '.body.build_id' "$COMPOSE_START")
else
COMPOSE_ID=$(jq -r '.build_id' "$COMPOSE_START")
fi
# Wait for the compose to finish. # Wait for the compose to finish.
greenprint "⏱ Waiting for compose to finish: ${COMPOSE_ID}" greenprint "⏱ Waiting for compose to finish: ${COMPOSE_ID}"
while true; do while true; do
sudo composer-cli --json compose info "${COMPOSE_ID}" | tee "$COMPOSE_INFO" > /dev/null sudo composer-cli --json compose info "${COMPOSE_ID}" | tee "$COMPOSE_INFO" > /dev/null
COMPOSE_STATUS=$(jq -r '.queue_status' "$COMPOSE_INFO") if rpm -q --quiet weldr-client; then
COMPOSE_STATUS=$(jq -r '.body.queue_status' "$COMPOSE_INFO")
else
COMPOSE_STATUS=$(jq -r '.queue_status' "$COMPOSE_INFO")
fi
# Is the compose finished? # Is the compose finished?
if [[ $COMPOSE_STATUS != RUNNING ]] && [[ $COMPOSE_STATUS != WAITING ]]; then if [[ $COMPOSE_STATUS != RUNNING ]] && [[ $COMPOSE_STATUS != WAITING ]]; then