Merge ~gary-wzl77/snappy-hwe-snaps/+git/tests-extras:update_assertion into ~snappy-hwe-team/snappy-hwe-snaps/+git/tests-extras:master

[Gary.Wang]

Update model and system-user assertion file.

Our system-user assertion file has been expired. We now extend
validation for three more years. I updated the model assertion too
since I use a new account-id.
For the record, the new account is <email address hidden> and
corresponding account-id: P6dgVeuoAbrvPznd7Ysvw9Bye4Mrxg

Update model and system-user assertion file.

Our system-user assertion file has been expired. We now extend
validation for three more years. I updated the model assertion too
since I use a new account-id.
For the record, the new account is <email address hidden> and
corresponding account-id: P6dgVeuoAbrvPznd7Ysvw9Bye4Mrxg

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

FAILED: Continuous integration, rev:ed6e4bf71598bf0a609fd5b5d1d750600d82cd42
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/131/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/181/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/181
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/181
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/181
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/975
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/722
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/744/console

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

review: Needs Fixing (continuous-integration)

[Simon Fels (morphis)]

LGTMLGTM

[Simon Fels (morphis)]

review: Approve

[Simon Fels (morphis)]

Approving on behalf of CI as it ran into a bug with projects not producing any snaps.

review: Approve (continuous-integration)

diff --git a/create-image-scripts/pc-model.json b/create-image-scripts/pc-model.json
index 2eb1411..269d7cf 100644
--- a/create-image-scripts/pc-model.json
+++ b/create-image-scripts/pc-model.json
@@ -1,11 +1,11 @@
 {
   "type": "model",
-  "authority-id": "4BKZlf4WMNBKgQfij0rftmp5BzDdVhlf",
-  "brand-id": "4BKZlf4WMNBKgQfij0rftmp5BzDdVhlf",
+  "authority-id": "P6dgVeuoAbrvPznd7Ysvw9Bye4MrxgM3",
+  "brand-id": "P6dgVeuoAbrvPznd7Ysvw9Bye4MrxgM3",
   "series": "16",
   "model": "pc",
   "architecture": "amd64",
   "gadget": "pc",
   "kernel": "pc-kernel",
-  "timestamp": "2016-09-09T08:27:36+00:00"
+  "timestamp": "2017-12-06T06:46:16+00:00"
 }
diff --git a/create-image-scripts/pc.model b/create-image-scripts/pc.model
index 345b7e4..0682142 100644
--- a/create-image-scripts/pc.model
+++ b/create-image-scripts/pc.model
@@ -1,21 +1,21 @@
 type: model
-authority-id: 4BKZlf4WMNBKgQfij0rftmp5BzDdVhlf
+authority-id: P6dgVeuoAbrvPznd7Ysvw9Bye4MrxgM3
 series: 16
-brand-id: 4BKZlf4WMNBKgQfij0rftmp5BzDdVhlf
+brand-id: P6dgVeuoAbrvPznd7Ysvw9Bye4MrxgM3
 model: pc
 architecture: amd64
 gadget: pc
 kernel: pc-kernel
-timestamp: 2016-09-09T08:27:36+00:00
-sign-key-sha3-384: a4qX7md6GQGNcZc_cmWPBStTq4RNCnGTzF-4usF5wFylQ-xZQej-SD6prx8Yl89O
+timestamp: 2017-12-06T06:46:16+00:00
+sign-key-sha3-384: r-KwqAN-85raUBRr3bBQXaAaJeCsdCpe1HRG3PQvpu93rGlRJWcELpSMbyO08QTT
 
-AcLBXAQAAQoABgUCWBBNTwAKCRAVoE002xqmOPH/EACWLf1UeZgICjNbzLI5bO/84LExS8iUjarG
-S7DRn8Ln5zu44pxz7UXJNjULgnU8yuKVPVWg0ij7DRvaj8tGxOMMAls1fjSRtEYR8oJFsI3jXDGw
-cLjvJG/crUxV8DgdZFlF02Kb5VtmNDXs1OE3zpPeniG19JYHaf2hDz4SRmWZe4c2MFrAt2UwI/VC
-o/209Fl3qA8p8x5EYOBycgHooHm3924NTF9mXbKSfLRgGS7YzmN4FXFyiGOTY6CRsp37XnkxGcA1
-+lyZz1X97qT/fOGVUFqHDqUZmuCs5sC3+DNonytTgKt5+7S+V+Ai45HEayD5f4gS9uscnTMTwEEJ
-VgSZRU0My+iJwFlXHaGWQe9eC37YCZ3ahBxc2SpkFffXjYhEMtTtr1vDIYCAhbc2k8aa3hPE2GUg
-3pv8zs1AuZzSVX+Rp4ysMBqU23UUVP6Bmvr7ZD3E8aEUxE6O/BEA10Km5oZPqpmBfcEVO8a0yZjn
-YQxn4XzY1Nwq1d0sJIV7FEDsq9dXH9QCa4qsCH3KG3jHv32GapvLf8mpr6HSH+JmPM5kNeVugLVy
-/RUAFNu+Y4hqhpRNC8fc+UDkVBXsLDqHb5gfXnhbFIH8LvpVFR20SSkg9/Km5xC+7wcey0h8SD6/
-Eh70OPLxDkzitEn/1L/0V987dlJnhS4WpqrYfbHYwQ==
+AcLBXAQAAQoABgUCWipeJQAKCRAcR13mgMRDAkZCD/9atEX343Zpcy0FjNi5XxO+I1DQVBY1tcB1
+2wM906GJnWbfp7TEyNNyX4HLdCSbpqDEYp4t8OthiFyK4v7eoGsVttoksPnXDoWRpBm+GIA1o4p3
+l9cloeaeGRVk324Tk5sJzgxF97e8k8nqsTrDWPiScUpP08NpzgO+j7uZr3tdpAhrpfZA10Y4QPQD
+Bm9X+dLwjMe+XfXa78hNzAZpL/kt6/jE8WeXa1Kt6puXF2wkkeBrfkH+XiUIqNXAm8LFea92By5l
+Z3gct9XBtsHqN1Hskim/9zqwUtQ1roUbDqZ+zcFmpoNnXwSfCbCel5rYrHTCV4eZ8gd7zrspG4cQ
+wVmZUkVSRZVQkc6hEZEWyskpzXVR/rSNnx2zr3zK+Fa25u6p2zRYSYihoSgybJdMepBgFNYpoUJj
+1GRo/kOpoNDPDnjWlziJlHlhlC4qClAmkF5h01ZVv5nERpccA5gjpgH7nC4eHorCue3/YH52xRZB
+8jnl2LpEzplnUfYyvz3XgItYOle9CUFVPV0JFxtxJoHHY9r/y6Ab/XAkRI0CW/S9+QpU5amefN08
+tCT9Lqm21mp5CIR1aPeTCI8JfSXyKvfr7rhJd1X4VmPn0SqlNaPQMHWw+c6h74lMsl+LO1gqk0Yu
+4e0WZBciYehrvEAf3aOp+UjTCuYAag3UzLSg9/tSRw==
diff --git a/create-image-scripts/test-user-assertion.json b/create-image-scripts/test-user-assertion.json
index e909183..d693e09 100644
--- a/create-image-scripts/test-user-assertion.json
+++ b/create-image-scripts/test-user-assertion.json
@@ -7,7 +7,7 @@
   "name": "Default Test User",
   "username": "test",
   "email": "test@localhost",
-  "password": "$6$47edKuoQVTtbzzKA$AGOUJ7aSXO5G9vcCD1lP3jATWIF1FOKxMxjybNO5/66dU5n3i.zHX3JvegI4f.IXgEM7ipEkYcV5LNaWo3pPs0",
-  "since": "2017-12-01T00:00:00+00:00",
-  "until": "2018-12-01T08:00:00+00:00"
+  "password": "$6$5qHlYm3N0wUiTa40$tQjOHTiy9mxv9Ar/vD705NTOVCYwnTd7UoCOSRatKf0QAUJ4ICfj6.MuqVgCvAcVE7idX7g3riGx8nDPUZBdg/",
+  "since": "2017-12-06T06:46:16+00:00",
+  "until": "2020-10-24T07:12:10+00:00"
 }
diff --git a/create-image-scripts/test-user.assertion b/create-image-scripts/test-user.assertion
index 9a243e4..2eba7dd 100644
--- a/create-image-scripts/test-user.assertion
+++ b/create-image-scripts/test-user.assertion
@@ -5,21 +5,21 @@ email: test@localhost
 models:
   - pc
 name: Default Test User
-password: $6$47edKuoQVTtbzzKA$AGOUJ7aSXO5G9vcCD1lP3jATWIF1FOKxMxjybNO5/66dU5n3i.zHX3JvegI4f.IXgEM7ipEkYcV5LNaWo3pPs0
+password: $6$5qHlYm3N0wUiTa40$tQjOHTiy9mxv9Ar/vD705NTOVCYwnTd7UoCOSRatKf0QAUJ4ICfj6.MuqVgCvAcVE7idX7g3riGx8nDPUZBdg/
 series:
   - 16
-since: 2017-12-01T00:00:00+00:00
-until: 2018-12-01T08:00:00+00:00
+since: 2017-12-06T06:46:16+00:00
+until: 2020-10-24T07:12:10+00:00
 username: test
-sign-key-sha3-384: Y2Iktzv0XGdTtwzs0CAbmtRa_a9KPxi_5qnp2CRnxg1RKek33gK5TpRfkSoGckFS
+sign-key-sha3-384: r-KwqAN-85raUBRr3bBQXaAaJeCsdCpe1HRG3PQvpu93rGlRJWcELpSMbyO08QTT
 
-AcLBXAQAAQoABgUCWigPogAKCRAw8YrZEYh6SS9mD/9llpzlQN4h4SpDdyw43oYQAgqYwq3xn6f7
-ZHDTBvtwjJJXJn2OD+5P25BJ4SuWN1xoZS1y17dFLXbvsnNk2ekQQAXyermmbtfZ1uNAeA+auzrD
-8tuudox0TiRkFlNbgcdMEHw5Q+Nsks2q6mfge9Y/bOFZNiiag4sSwjHFPpQwzxMx5dDpDcqTRGt/
-pkOADRZzgrDWiKbhUkTid0MRYKSw8mX4XFKkfyDPv9Wn0qGx43JLbs0TedE9n0XSdE1ig5S6Xw6q
-ryFtvjktTU/LWqvpnA0G7pJUFijU4U4o9NzAcgC1UV7ABnHTZpFymimLQYboWNRrzhsIBEyrDMNr
-t0qPAJ+2YNBtQ6KaGEEFnM3cRJrJNlBqV0HG8y8u4BChtQoA8+J5dm9S9s1h29a6dSDJ15gM9LAA
-/Pn8IVPdYqRcD797wkK74tFehvMOq1vpVEj90UjVha50DYaKBxQ4Ws9ib9quecgBAzxx9EPBBjri
-vsHs05qMsCgd2lIYIcfSSMJmWpXrHrSaKqMG9AworMqrGVc0C4VaRuDcuT95TvDXeJxQFHcRlke3
-ngikBXfVGXIm1kd47qac3+N9Gx9zrTzj0ZhYloyruxI0rtiYtR7YDJ4qTIw/dPgm+s6VZZ7Vdj48
-LaeeOQ2jdvqq372ta4IWO8ruzWYuZ6I6dqCHANBtlw==
+AcLBXAQAAQoABgUCWipd8gAKCRAcR13mgMRDAkVLEACgNsFIY9nTNPYPead4WuJMYGZQ5PlHu1Rc
+vusDh5V6VPUnPqAS7mg+MPFU+MAIlFgT+I0aeca1ItM2fp0iA9dbfp6DO7TPS2+D5zzi1eZ5zZOh
+82bWOvk7zs/n1q3wPp9iu5y3qfEoB2BMGeRCjI5YSsnM4sSu4scAvWAnh46iOiiSMOSc9qhS57kB
+buAGI1kuHLIpZnOEYzAiYhAJ8Nc0GkrT9ImtvDtwsX/OeiY50HAFVxh3ECzkK3UVrInN86H9UZ5R
+2ukT7cf/A/bUJ56tLowQb6dndwFdAJ2WnBH3z3jV93HdCq676PftpZ5C+irw6o5Ww7a7CFDy7kX4
+d59Ya1vNVCaapf5a1sayE6nBosVzn7yLStUUdZdiCtFX+52xBLFzNb6oJRLFl9N+GmqFb3PTVb05
+l64FjKFSeOWXH4Z+Ek2+LKunm8keu62w2N0EHwBBo1dd+Kz2OprGp8+/2HdUvKHEXMYvchaZ8yTn
+ID92nj2YFHPYls4bY3f+Hv0CMjjHUiEOl0dV0oT5lXdGn8h2n6Y/1yWMeZERoYs/tBRK4LtHx6kZ
+IV/73i3pZnhDIrftJOaHnfv3Lk8XYg/ZJpWY75QV73HP24B8YKCvXJ0JpQ6oC4oqXLZtxT04McF2
+th+wXT/DcATtrYRvJnqaC5H1ov9DAH1xqZ3/mVAbMQ==