Skip to content

testing: OCI availability domain is now required (SC-59) #910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blackboxsw merged 3 commits into from
Jun 15, 2021
Merged

testing: OCI availability domain is now required (SC-59) #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52d3ba6
testing: OCI availability domain is now required
TheRealFalcon May 25, 2021
f97ab68
Update pycloudlib requirement to latest commit
TheRealFalcon Jun 11, 2021
f3e5648
Merge branch 'master' into oci-availability-domain
blackboxsw Jun 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion integration-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
9 changes: 8 additions & 1 deletion tests/integration_tests/clouds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)


Expand Down
7 changes: 7 additions & 0 deletions tests/integration_tests/integration_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Copy link
Copy Markdown
Collaborator

@blackboxsw blackboxsw Jun 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this comment, future me will need it.

ORACLE_AVAILABILITY_DOMAIN = None

##################################################################
# USER SETTINGS OVERRIDES
##################################################################
Expand Down