diff options
| author | Paride Legovini <paride.legovini@canonical.com> | 2022-01-20 00:43:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 16:43:05 -0700 |
| commit | 4c7d159c3efe39860d3c01bf680ba686b87adb77 (patch) | |
| tree | 1eedda97b1d0067260ddc770e02240cb3615a42e | |
| parent | 20bd192db661e519b860a0799de04c663ceae0c6 (diff) | |
| download | vyos-cloud-init-4c7d159c3efe39860d3c01bf680ba686b87adb77.tar.gz vyos-cloud-init-4c7d159c3efe39860d3c01bf680ba686b87adb77.zip | |
integration: test against the Ubuntu daily images (#1198)
Dailies are always available for stable releases and the devel release.
Moreover testing against dailies will warn us earlier about issues.
| -rw-r--r-- | tests/integration_tests/clouds.py | 6 | ||||
| -rw-r--r-- | tests/integration_tests/test_upgrade.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/integration_tests/clouds.py b/tests/integration_tests/clouds.py index e55093b1..3b80caf3 100644 --- a/tests/integration_tests/clouds.py +++ b/tests/integration_tests/clouds.py @@ -106,14 +106,14 @@ class IntegrationCloud(ABC): def __init__(self, settings=integration_settings): self.settings = settings self.cloud_instance = self._get_cloud_instance() - self.released_image_id = self._get_initial_image() + self.initial_image_id = self._get_initial_image() self.snapshot_id = None @property def image_id(self): if self.snapshot_id: return self.snapshot_id - return self.released_image_id + return self.initial_image_id def emit_settings_to_log(self) -> None: log.info( @@ -133,7 +133,7 @@ class IntegrationCloud(ABC): def _get_initial_image(self): image = ImageSpecification.from_os_image() try: - return self.cloud_instance.released_image(image.image_id) + return self.cloud_instance.daily_image(image.image_id) except (ValueError, IndexError): return image.image_id diff --git a/tests/integration_tests/test_upgrade.py b/tests/integration_tests/test_upgrade.py index e53ea998..b13d4703 100644 --- a/tests/integration_tests/test_upgrade.py +++ b/tests/integration_tests/test_upgrade.py @@ -59,7 +59,7 @@ def test_clean_boot_of_upgraded_package(session_cloud: IntegrationCloud): return launch_kwargs = { - "image_id": session_cloud.released_image_id, + "image_id": session_cloud.initial_image_id, } with session_cloud.launch( @@ -178,7 +178,7 @@ def test_subsequent_boot_of_upgraded_package(session_cloud: IntegrationCloud): pytest.skip(UNSUPPORTED_INSTALL_METHOD_MSG.format(source)) return # type checking doesn't understand that skip raises - launch_kwargs = {"image_id": session_cloud.released_image_id} + launch_kwargs = {"image_id": session_cloud.initial_image_id} with session_cloud.launch(launch_kwargs=launch_kwargs) as instance: instance.install_new_cloud_init( |