Chad Smith has proposed merging ~chad.smith/cloud-init:ubuntu/devel into
cloud-init:ubuntu/devel.
Commit message:
Sync integration test fixes for metadata changes persisted to
instance-data.json. new-upstream-release
Requested reviews:
cloud-init commiters (cloud-init-dev)
Related bugs:
Bug #1797199 in cloud-init: "kvm integration test failures due to invalid
config-disk path"
https://bugs.launchpad.net/cloud-init/+bug/1797199
Bug #1797231 in cloud-init: "ec2 integration test failure on changed
instance-data.json"
https://bugs.launchpad.net/cloud-init/+bug/1797231
For more details, see:
https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/356591
--
Your team cloud-init commiters is requested to review the proposed merge of
~chad.smith/cloud-init:ubuntu/devel into cloud-init:ubuntu/devel.
diff --git a/debian/changelog b/debian/changelog
index 1ebc3c4..117fd16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+cloud-init (18.4-7-g4652b196-0ubuntu1) cosmic; urgency=medium
+
+ * New upstream snapshot.
+ - tests: meta_data key changed to meta-data in ec2 instance-data.json
+ (LP: #1797231)
+ - tests: fix kvm integration test to assert flexible config-disk path
+ (LP: #1797199)
+
+ -- Chad Smith <chad.sm...@canonical.com> Thu, 11 Oct 2018 09:24:46 -0600
+
cloud-init (18.4-5-g6ee8a2c5-0ubuntu1) cosmic; urgency=medium
* New upstream snapshot.
diff --git a/tests/cloud_tests/testcases/base.py b/tests/cloud_tests/testcases/base.py
index 16b268e..fd12d87 100644
--- a/tests/cloud_tests/testcases/base.py
+++ b/tests/cloud_tests/testcases/base.py
@@ -177,7 +177,7 @@ class CloudTestCase(unittest2.TestCase):
instance_data['base64_encoded_keys'])
ds = instance_data.get('ds', {})
v1_data = instance_data.get('v1', {})
- metadata = ds.get('meta_data', {})
+ metadata = ds.get('meta-data', {})
macs = metadata.get(
'network', {}).get('interfaces', {}).get('macs', {})
if not macs:
@@ -262,7 +262,10 @@ class CloudTestCase(unittest2.TestCase):
self.assertItemsEqual([], instance_data['base64_encoded_keys'])
self.assertEqual('unknown', v1_data['cloud_name'])
self.assertEqual('nocloud', v1_data['platform'])
- self.assertEqual('config-disk (/dev/vda)', v1_data['subplatform'])
+ subplatform = v1_data['subplatform']
+ self.assertIsNotNone(
+ re.match(r'config-disk \(\/dev\/[a-z]{3}\)', subplatform),
+ 'kvm subplatform "%s" != "config-disk (/dev/...)"' % subplatform)
self.assertIsNone(
v1_data['availability_zone'],
'found unexpected kvm availability_zone %s' %
_______________________________________________
Mailing list: https://launchpad.net/~cloud-init-dev
Post to : cloud-init-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~cloud-init-dev
More help : https://help.launchpad.net/ListHelp
