cloud-init-dev team mailing list archive

[Joshua Powers <josh.powers@xxxxxxxxxxxxx>]

Joshua Powers has proposed merging ~powersj/cloud-init:fix-apt-keyserver into cloud-init:master.

Commit message:
test: fix incorrect keyid

The test is currently importing the incorrect keyid. It specifies
the curtin developers ppa, rather than the cloud-init ppa. On
Artful this causes failures as a check is made to verify the
correct key is imported for the ppa, whereas on previous releases
this was not done.

LP: #1702717

Requested reviews:
  cloud-init commiters (cloud-init-dev)
Related bugs:
  Bug #1702717 in cloud-init: "test: keyid specified does not match ppa"
  https://bugs.launchpad.net/cloud-init/+bug/1702717

For more details, see:
https://code.launchpad.net/~powersj/cloud-init/+git/cloud-init/+merge/326951

Tested with:
python3 -m tests.cloud_tests run -n xenial -n artful -n zesty -n yakkety -v -t modules/apt_configure_sources_keyserver --preserve-data --data-dir output

https://paste.ubuntu.com/25033218/
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~powersj/cloud-init:fix-apt-keyserver into cloud-init:master.

diff --git a/tests/cloud_tests/configs/modules/apt_configure_sources_keyserver.yaml b/tests/cloud_tests/configs/modules/apt_configure_sources_keyserver.yaml
index 11da61e..50b423b 100644
--- a/tests/cloud_tests/configs/modules/apt_configure_sources_keyserver.yaml
+++ b/tests/cloud_tests/configs/modules/apt_configure_sources_keyserver.yaml
@@ -9,7 +9,7 @@ cloud_config: |
   apt:
     sources:
       source1:
-        keyid: 0165013E
+        keyid: E4D304DF
         keyserver: keyserver.ubuntu.com
         source: "deb http://ppa.launchpad.net/cloud-init-dev/test-archive/ubuntu $RELEASE main"
 collect_scripts:
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_sources_keyserver.py b/tests/cloud_tests/testcases/modules/apt_configure_sources_keyserver.py
index 2e6b293..ddc8617 100644
--- a/tests/cloud_tests/testcases/modules/apt_configure_sources_keyserver.py
+++ b/tests/cloud_tests/testcases/modules/apt_configure_sources_keyserver.py
@@ -11,8 +11,8 @@ class TestAptconfigureSourcesKeyserver(base.CloudTestCase):
         """Test specific key added."""
         out = self.get_data_file('apt_key_list')
         self.assertIn(
-            '1BC3 0F71 5A3B 8612 47A8  1A5E 55FE 7C8C 0165 013E', out)
-        self.assertIn('Launchpad PPA for curtin developers', out)
+            '1FF0 D853 5EF7 E719 E5C8  1B9C 083D 06FB E4D3 04DF', out)
+        self.assertIn('Launchpad PPA for cloud init development team', out)
 
     def test_source_list(self):
         """Test source.list updated."""