diff options
| author | James Falcon <TheRealFalcon@users.noreply.github.com> | 2021-01-22 09:25:38 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 09:25:38 -0600 |
| commit | 1527efa740ce7e66d9506ea62b0b8010d71a4104 (patch) | |
| tree | c0f791ebb2a111d3edc507b720f5e06f66f8c69f | |
| parent | 2d0b63681ca411a606b7d4f4d316320395d30e82 (diff) | |
| download | vyos-cloud-init-1527efa740ce7e66d9506ea62b0b8010d71a4104.tar.gz vyos-cloud-init-1527efa740ce7e66d9506ea62b0b8010d71a4104.zip | |
Use more cloud defaults in integration tests (#757)
Stop requiring compartment_id for OCI and project_id for GCE since they
can now be inferred in pycloudlib.
| -rw-r--r-- | integration-requirements.txt | 2 | ||||
| -rw-r--r-- | tests/integration_tests/clouds.py | 6 | ||||
| -rw-r--r-- | tests/integration_tests/integration_settings.py | 18 |
3 files changed, 2 insertions, 24 deletions
diff --git a/integration-requirements.txt b/integration-requirements.txt index ec765763..4682caa0 100644 --- a/integration-requirements.txt +++ b/integration-requirements.txt @@ -1,5 +1,5 @@ # PyPI requirements for cloud-init integration testing # https://cloudinit.readthedocs.io/en/latest/topics/integration_tests.html # -pycloudlib @ git+https://github.com/canonical/pycloudlib.git@72e800b8e99c5b735348c4778f19f92cf6c63de0 +pycloudlib @ git+https://github.com/canonical/pycloudlib.git@39805087affaed07b266d64cf0d883be775b5c0f pytest diff --git a/tests/integration_tests/clouds.py b/tests/integration_tests/clouds.py index fc0a61d5..63240d17 100644 --- a/tests/integration_tests/clouds.py +++ b/tests/integration_tests/clouds.py @@ -216,9 +216,6 @@ class GceCloud(IntegrationCloud): def _get_cloud_instance(self): return GCE( tag='gce-integration-test', - project=self.settings.GCE_PROJECT, - region=self.settings.GCE_REGION, - zone=self.settings.GCE_ZONE, ) @@ -246,8 +243,7 @@ class OciCloud(IntegrationCloud): def _get_cloud_instance(self): return OCI( - tag='oci-integration-test', - compartment_id=self.settings.OCI_COMPARTMENT_ID + tag='oci-integration-test' ) diff --git a/tests/integration_tests/integration_settings.py b/tests/integration_tests/integration_settings.py index 6cabf3d8..22b4fdda 100644 --- a/tests/integration_tests/integration_settings.py +++ b/tests/integration_tests/integration_settings.py @@ -88,24 +88,6 @@ PUBLIC_SSH_KEY = None KEYPAIR_NAME = None ################################################################## -# GCE SPECIFIC SETTINGS -################################################################## -# Required for GCE -GCE_PROJECT = None - -# You probably want to override these -GCE_REGION = 'us-central1' -GCE_ZONE = 'a' - -################################################################## -# OCI SPECIFIC SETTINGS -################################################################## -# Compartment-id found at -# https://console.us-phoenix-1.oraclecloud.com/a/identity/compartments -# Required for Oracle -OCI_COMPARTMENT_ID = None - -################################################################## # USER SETTINGS OVERRIDES ################################################################## # Bring in any user-file defined settings |