diff options
| author | James Falcon <TheRealFalcon@users.noreply.github.com> | 2021-06-14 21:37:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-14 20:37:15 -0600 |
| commit | 59a3d84562a0fdeb16a4a566371294790d110ad4 (patch) | |
| tree | 5b972cba7bb0da60e4864aee9e9c67d350abdf52 | |
| parent | 59a848c5929cbfca45d95860eb60dfebd0786c94 (diff) | |
| download | cloud-init-git-59a3d84562a0fdeb16a4a566371294790d110ad4.tar.gz | |
testing: OCI availability domain is now required (SC-59) (#910)
| -rw-r--r-- | integration-requirements.txt | 2 | ||||
| -rw-r--r-- | tests/integration_tests/clouds.py | 9 | ||||
| -rw-r--r-- | tests/integration_tests/integration_settings.py | 7 |
3 files changed, 16 insertions, 2 deletions
diff --git a/integration-requirements.txt b/integration-requirements.txt index 95891356..8b6a9514 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 diff --git a/tests/integration_tests/clouds.py b/tests/integration_tests/clouds.py index 1378b215..4a0d3008 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 0703be58..e4a790c2 100644 --- a/tests/integration_tests/integration_settings.py +++ b/tests/integration_tests/integration_settings.py @@ -98,6 +98,13 @@ KEYPAIR_NAME = None 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 ################################################################## # Bring in any user-file defined settings |