From 1527efa740ce7e66d9506ea62b0b8010d71a4104 Mon Sep 17 00:00:00 2001 From: James Falcon Date: Fri, 22 Jan 2021 09:25:38 -0600 Subject: 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. --- tests/integration_tests/clouds.py | 6 +----- tests/integration_tests/integration_settings.py | 18 ------------------ 2 files changed, 1 insertion(+), 23 deletions(-) (limited to 'tests/integration_tests') 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 @@ -87,24 +87,6 @@ PUBLIC_SSH_KEY = None # 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 ################################################################## -- cgit v1.2.3