use the real model assertion when creating the core imagefeature/real-model-assertion

1 files changed, 25 insertions, 12 deletions

diff --git a/tests/lib/prepare.sh b/tests/lib/prepare.sh
index db1133addf..e01de73e74 100755
--- a/tests/lib/prepare.sh
+++ b/tests/lib/prepare.sh
@@ -78,21 +78,34 @@ setup_reflash_magic() {
 # build new core snap for the image
 snapbuild $UNPACKD $IMAGE_HOME
 
- # FIXME: remove once we have a proper model.assertion
- . $TESTSLIB/store.sh
- STORE_DIR=/tmp/fake-store-blobdir
- mkdir -p $STORE_DIR
- setup_store fake-w-assert-fallback $STORE_DIR
- cp $TESTSLIB/assertions/developer1.account $STORE_DIR/asserts
- cp $TESTSLIB/assertions/developer1.account-key $STORE_DIR/asserts
+ # FIXME: fetch directly once its in the assertion service
+ cat > $IMAGE_HOME/pc.model <<EOF
+type: model
+authority-id: canonical
+series: 16
+brand-id: canonical
+model: pc
+architecture: amd64
+gadget: pc
+kernel: pc-kernel
+timestamp: 2016-08-31T00:00:00.0Z
+sign-key-sha3-384: 9tydnLa6MTJ-jaQTFUXEwHl1yRx7ZS4K5cyFDhYDcPzhS7uyEkDxdUjg9g08BtNn
+
+AcLBXAQAAQoABgUCV8lRDQAKCRDgT5vottzAEg9GEACsSb+qXB34mwESsd7ns6VpM9BfAOOSstwB
+KJlWOlcJ39M7is/fO+dxRH4XsI7Td6BI1WEf5188sJuld8APUsTPn8tPYN3JB5CJ8Edkr6p78YUW
+f3Wo26USAE32ewjq9kHo6uBqIr4VixjTXfGUeDXc7tvKcduIMokSKjDLRHJRur1NC8LjkBn2ZPi8
+9d0BpJzr5y8wK0yFEyAhaS8H8LvL7VMjKG7/BkZcQ0a3jv69qh9jdmxnKDN2zcd1btRR1Giew3gw
+VJ8lNtfxQSWi+nYNEuzDqwKdffo9sVyCzBC+vEH3xYYk8NpRx2QgCSzDCPMoxaJgLwhAeWz6mHQp
+8EaGOsMZm7c85BXUcdJGEhZ5MpNGSzCb/ifgOKBB6zYzekiQh4TVLgi9Uk/acsLH75vNrI8Kwyl+
+r4Pahf///LbeWNwcEonaSV48S5fg3QqxEQeb42xcp6wPfRr7LN1LvQ9kRQTt42GDAlIva5HKlo0T
+cUb5A4zz3IlBn/KQ4BS/2sBcixrH97tHInef4oA8IrBiBDGnIv/s4qyZ+gB5fX8Ohnn/a5bUgU5u
+GmwRQ12Ix54YGJrzZocu1AiQINij4s6ZSoJAEJobI9VBK8WnV8PRmra6UJonV+qrJOiSKTJVCkAF
++RFartQL+pjF/H29FsyBkIEcPwhTslxWKUWajHsExw==
+EOF
 
 # FIXME: how to test store updated of ubuntu-core with sideloaded snap?
- export SNAPPY_FORCE_SAS_URL=http://localhost:11028
 IMAGE=all-snap-amd64.img
- /tmp/go/bin/ubuntu-device-flash core 16 $TESTSLIB/assertions/developer1-pc.model --channel edge --install snapweb --install $IMAGE_HOME/ubuntu-core_*.snap --output $IMAGE_HOME/$IMAGE
-
- # teardown store
- teardown_store fake $STORE_DIR
+ /tmp/go/bin/ubuntu-device-flash core 16 $IMAGE_HOME/pc.model --channel edge --install snapweb --install $IMAGE_HOME/ubuntu-core_*.snap --output $IMAGE_HOME/$IMAGE
 
 # mount fresh image and add all our SPREAD_PROJECT data
 kpartx -avs $IMAGE_HOME/$IMAGE