From be382ecef8f071fb3909a4f2767602bf294fc83a Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Fri, 28 Jan 2022 14:01:23 +0100 Subject: [PATCH] test/ostree: update ostree compose request to match new requirements Specifying a parent commit ID without a URL isn't allowed now. The upgrade commit is built without a parent. The OS upgrade should still work without it. Getting the ID of the first commit is not necessary now. --- test/cases/ostree.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/cases/ostree.sh b/test/cases/ostree.sh index b1f0ee6a4..0f90ab71b 100755 --- a/test/cases/ostree.sh +++ b/test/cases/ostree.sh @@ -199,7 +199,7 @@ build_image() { # Start the compose. greenprint "🚀 Starting compose" if [[ $blueprint_name == upgrade ]]; then - sudo composer-cli --json compose start-ostree --ref "$OSTREE_REF" --parent "$COMMIT_HASH" "$blueprint_name" $IMAGE_TYPE | tee "$COMPOSE_START" + sudo composer-cli --json compose start-ostree --ref "$OSTREE_REF" "$blueprint_name" $IMAGE_TYPE | tee "$COMPOSE_START" else sudo composer-cli --json compose start "$blueprint_name" $IMAGE_TYPE | tee "$COMPOSE_START" fi @@ -336,10 +336,6 @@ greenprint "Clean up osbuild-composer" sudo composer-cli compose delete "${COMPOSE_ID}" > /dev/null sudo composer-cli blueprints delete ostree > /dev/null -# Get ostree commit value. -greenprint "Get ostree image commit value" -COMMIT_HASH=$(jq -r '."ostree-commit"' < ${HTTPD_PATH}/compose.json) - # Ensure SELinux is happy with our new images. greenprint "👿 Running restorecon on image directory" sudo restorecon -Rv /var/lib/libvirt/images/