diff options
| author | Scott Moser <smoser@brickies.net> | 2017-11-20 16:51:09 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-11-20 16:51:50 -0500 |
| commit | 7624348712b4502f0085d30c05b34dce3f2ceeae (patch) | |
| tree | ae2a3bedfc2a225daca5b7b749a2cbfd0b4a9975 | |
| parent | 281a82181716183d526e76f4e0415e0a6f680cbe (diff) | |
| download | vyos-cloud-init-7624348712b4502f0085d30c05b34dce3f2ceeae.tar.gz vyos-cloud-init-7624348712b4502f0085d30c05b34dce3f2ceeae.zip | |
integration test: replace curtin test ppa with cloud-init test ppa.
Cloud-init integration tests should not depend on a curtin test ppa.
We already had a cloud-init test ppa for explicitly this purpose.
Just use it instead.
| -rw-r--r-- | tests/cloud_tests/testcases/modules/apt_configure_sources_ppa.py | 6 | ||||
| -rw-r--r-- | tests/cloud_tests/testcases/modules/apt_configure_sources_ppa.yaml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_sources_ppa.py b/tests/cloud_tests/testcases/modules/apt_configure_sources_ppa.py index d299e9ad..dfbdeadf 100644 --- a/tests/cloud_tests/testcases/modules/apt_configure_sources_ppa.py +++ b/tests/cloud_tests/testcases/modules/apt_configure_sources_ppa.py @@ -11,13 +11,13 @@ class TestAptconfigureSourcesPPA(base.CloudTestCase): """Test specific ppa added.""" out = self.get_data_file('sources.list') self.assertIn( - 'http://ppa.launchpad.net/curtin-dev/test-archive/ubuntu', out) + 'http://ppa.launchpad.net/cloud-init-dev/test-archive/ubuntu', out) def test_ppa_key(self): """Test ppa key added.""" out = self.get_data_file('apt-key') 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) # vi: ts=4 expandtab diff --git a/tests/cloud_tests/testcases/modules/apt_configure_sources_ppa.yaml b/tests/cloud_tests/testcases/modules/apt_configure_sources_ppa.yaml index 9efdae52..b997bcfb 100644 --- a/tests/cloud_tests/testcases/modules/apt_configure_sources_ppa.yaml +++ b/tests/cloud_tests/testcases/modules/apt_configure_sources_ppa.yaml @@ -2,7 +2,7 @@ # Add a PPA to source.list # # NOTE: on older ubuntu releases the sources file added is named -# 'curtin-dev-test-archive-trusty', without 'ubuntu' in the middle +# 'cloud-init-dev-test-archive-trusty', without 'ubuntu' in the middle required_features: - apt - ppa @@ -14,11 +14,11 @@ cloud_config: | source1: keyid: 0165013E keyserver: keyserver.ubuntu.com - source: "ppa:curtin-dev/test-archive" + source: "ppa:cloud-init-dev/test-archive" collect_scripts: sources.list: | #!/bin/bash - cat /etc/apt/sources.list.d/curtin-dev-ubuntu-test-archive-*.list + cat /etc/apt/sources.list.d/cloud-init-dev-ubuntu-test-archive-*.list apt-key: | #!/bin/bash apt-key finger |