summaryrefslogtreecommitdiff
path: root/tests/cloud_tests
diff options
context:
space:
mode:
authorJoshua Powers <josh.powers@canonical.com>2017-07-06 09:35:45 -0700
committerScott Moser <smoser@brickies.net>2017-07-11 14:08:53 -0400
commit067721672570cc83d54d2c2d5677eeb79bef85e2 (patch)
tree554de8803e2df8bed53883dd031b98ca77e13403 /tests/cloud_tests
parent32e9a4d806473c74be505bc69ab8f36ee6c5d448 (diff)
downloadvyos-cloud-init-067721672570cc83d54d2c2d5677eeb79bef85e2.tar.gz
vyos-cloud-init-067721672570cc83d54d2c2d5677eeb79bef85e2.zip
test: fix incorrect keyid for apt repository.
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 only a warning was issued. Also, change to use a full key fingerprint. LP: #1702717
Diffstat (limited to 'tests/cloud_tests')
-rw-r--r--tests/cloud_tests/configs/modules/apt_configure_sources_keyserver.yaml2
-rw-r--r--tests/cloud_tests/testcases/modules/apt_configure_sources_keyserver.py4
2 files changed, 3 insertions, 3 deletions
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 11da61ea..25088135 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: 1FF0D8535EF7E719E5C81B9C083D06FBE4D304DF
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 2e6b293f..ddc86174 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."""