From 0cb05661ceaa5f810f260fd6fd851e49934fcabf Mon Sep 17 00:00:00 2001 From: James Falcon Date: Fri, 8 Jan 2021 10:31:52 -0600 Subject: [PATCH 1/2] Use more cloud defaults in integration tests Stop requiring compartment_id for OCI and project_id for GCE since they can no be inferred in pycloudlib. --- tests/integration_tests/clouds.py | 6 +----- .../integration_tests/integration_settings.py | 18 ------------------ 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/tests/integration_tests/clouds.py b/tests/integration_tests/clouds.py index fc0a61d5be9..63240d17953 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 6cabf3d8a49..22b4fddaf5f 100644 --- a/tests/integration_tests/integration_settings.py +++ b/tests/integration_tests/integration_settings.py @@ -87,24 +87,6 @@ # for the keypair. (Defaults to pycloudlib's default behaviour.) 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 ################################################################## From d199e89dacef2d2a098cd958dc18ed7f1021e21a Mon Sep 17 00:00:00 2001 From: James Falcon Date: Wed, 20 Jan 2021 16:05:25 -0600 Subject: [PATCH 2/2] [squash] Update pycloudlib version --- integration-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-requirements.txt b/integration-requirements.txt index ec765763003..4682caa0362 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