From 52d3ba690592d6ab4c303f0d632190720b300dad Mon Sep 17 00:00:00 2001 From: James Falcon Date: Tue, 25 May 2021 11:21:25 -0500 Subject: [PATCH 1/2] testing: OCI availability domain is now required --- tests/integration_tests/clouds.py | 9 ++++++++- tests/integration_tests/integration_settings.py | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/integration_tests/clouds.py b/tests/integration_tests/clouds.py index 1378b215e5c..4a0d3008c75 100644 --- a/tests/integration_tests/clouds.py +++ b/tests/integration_tests/clouds.py @@ -247,8 +247,15 @@ class OciCloud(IntegrationCloud): integration_instance_cls = IntegrationOciInstance def _get_cloud_instance(self): + if not integration_settings.ORACLE_AVAILABILITY_DOMAIN: + raise Exception( + 'ORACLE_AVAILABILITY_DOMAIN must be set to a valid ' + 'availability domain. If using the oracle CLI, ' + 'try `oci iam availability-domain list`' + ) return OCI( - tag='oci-integration-test' + tag='oci-integration-test', + availability_domain=integration_settings.ORACLE_AVAILABILITY_DOMAIN ) diff --git a/tests/integration_tests/integration_settings.py b/tests/integration_tests/integration_settings.py index 0703be58567..e4a790c212e 100644 --- a/tests/integration_tests/integration_settings.py +++ b/tests/integration_tests/integration_settings.py @@ -97,6 +97,13 @@ # in `openstack network list` OPENSTACK_NETWORK = None +################################################################## +# OCI SETTINGS +################################################################## +# Availability domain to use for Oracle. Should be one of the namess found +# in `oci iam availability-domain list` +ORACLE_AVAILABILITY_DOMAIN = None + ################################################################## # USER SETTINGS OVERRIDES ################################################################## From f97ab68fe6d0d54d45fbbaff43907735cdf71a94 Mon Sep 17 00:00:00 2001 From: James Falcon Date: Fri, 11 Jun 2021 09:07:33 -0500 Subject: [PATCH 2/2] Update pycloudlib requirement to latest commit --- integration-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-requirements.txt b/integration-requirements.txt index 95891356cbe..8b6a951410a 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@96b146ee1beb99b8e44e36525e18a9a20e00c3f2 +pycloudlib @ git+https://github.com/canonical/pycloudlib.git@c128d4d87b226b9c294de167ed753e644cf0526a pytest