Merge ~powersj/cloud-init:fix-apt-keyserver into cloud-init:master

[Joshua Powers]

test: fix incorrect keyid

The test is currently importing the incorrect keyid. It specifies
the curtin developers ppa, rather than the cloud-init ppa. As of
apt in Artful, rather than a warning, not having the correct key is causing an error resulting in a test failure.

LP: #1702717

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/

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:8628df67deb3652fa416097ef61e5ff490ef4a47
https://jenkins.ubuntu.com/server/job/cloud-init-ci/30/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: CentOS 6 & 7: Build & Test
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/30/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

So how did it work with non-artful ?

Also, lets change the short keyid to be a long keyid.

review: Needs Information

[Scott Moser (smoser)]

do you have an example of a fail ?

[Joshua Powers (powersj)]

For a failure see:
https://jenkins.ubuntu.com/server/job/cloud-init-integration-a/81/artifact/cloud-init/results/lxd/artful/modules/apt_configure_sources_keyserver/

[Joshua Powers (powersj)]

In previous versions this is a warning:

W: GPG error: http://ppa.launchpad.net/cloud-init-dev/test-archive/ubuntu xenial InRelease: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY 083D06FBE4D304DF
W: The repository 'http://ppa.launchpad.net/cloud-init-dev/test-archive/ubuntu xenial InRelease' is not signed.

In artful as of last week sometime it is now an error:

W: GPG error: http://ppa.launchpad.net/cloud-init-dev/test-archive/ubuntu artful InRelease: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY 083D06FBE4D304DF
E: The repository 'http://ppa.launchpad.net/cloud-init-dev/test-archive/ubuntu artful InRelease' is not signed.

[Scott Moser (smoser)]

It would appear this is the changelog entry:
 fail InRelease on non-404 HTTP errorcodes
that came in 1.5~alpha1.

[Scott Moser (smoser)]

i think commit https://github.com/Debian/apt/commit/cbbf185c3c55effe47f218a07e7b1f324973a8a6

61726d6... by Joshua Powers on 2017-07-11

Updating keyid to use fingerprint

[Joshua Powers (powersj)]

Updated the keyid to use the fingerprint as requested.

Updated commit message to refect both the recent change in behavior by apt and the mistake of using the wrong key.

[Scott Moser (smoser)]

I'm going to change to use the long fingerprint and then pull this.

review: Approve

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..5fe575e 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: 1FF0 D853 5EF7 E719 E5C8  1B9C 083D 06FB E4D3 04DF
         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."""