Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/tests-extras:sync-kpartx into ~snappy-hwe-team/snappy-hwe-snaps/+git/tests-extras:master

[Alfonso Sanchez-Beato]

Sync before exiting kpartx, so the sleep is not necessary

[Roberto Mier Escandon (rmescandon)]

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:db4627fc83bfd30e6384b4f1a1aef0e2e2d0123e
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/47/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/97/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/97
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/97
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/97
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/887
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/635
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/655/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/47/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:c402c0c31d0dbdeafff5fd0ff0ea789a32ce369c
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/54/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/104
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/104
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/104
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/104
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/900
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/647
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/667/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/54/rebuild

review: Approve (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

diff --git a/create-image-scripts/create-image.sh b/create-image-scripts/create-image.sh
index 3129d37..dd135c7 100755
--- a/create-image-scripts/create-image.sh
+++ b/create-image-scripts/create-image.sh
@@ -107,8 +107,8 @@ ubuntu-image \
 	$model.model
 
 mv $model.img $image_name
-kpartx -a $image_name
-sleep 0.5
+# -s: don't return until the partitions are created
+kpartx -asv $image_name
 
 loop_path=$(findfs LABEL=writable)
 tmp_mount=$(mktemp -d)