Skip to content

Use more cloud defaults in integration tests #757

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
TheRealFalcon merged 4 commits into from
Jan 22, 2021
Merged

Use more cloud defaults in integration tests #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cb0566
Use more cloud defaults in integration tests
TheRealFalcon Jan 8, 2021
d199e89
[squash] Update pycloudlib version
TheRealFalcon Jan 20, 2021
4f61f2f
Merge branch 'master' into cloud-defaults
TheRealFalcon Jan 21, 2021
62e3ad3
Merge branch 'master' into cloud-defaults
OddBloke Jan 21, 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@72e800b8e99c5b735348c4778f19f92cf6c63de0
pycloudlib @ git+https://github.com/canonical/pycloudlib.git@39805087affaed07b266d64cf0d883be775b5c0f
pytest
6 changes: 1 addition & 5 deletions tests/integration_tests/clouds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)


Expand Down Expand Up @@ -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'
)


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