summaryrefslogtreecommitdiff
path: root/tests/integration_tests/integration_settings.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/integration_tests/integration_settings.py')
-rw-r--r--tests/integration_tests/integration_settings.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/integration_tests/integration_settings.py b/tests/integration_tests/integration_settings.py
index 22b4fdda..157d34ad 100644
--- a/tests/integration_tests/integration_settings.py
+++ b/tests/integration_tests/integration_settings.py
@@ -59,6 +59,8 @@ EXISTING_INSTANCE_ID = None
# code.
# PROPOSED
# Install from the Ubuntu proposed repo
+# UPGRADE
+# Upgrade cloud-init to the version in the Ubuntu archive
# <ppa repo>, e.g., ppa:cloud-init-dev/proposed
# Install from a PPA. It MUST start with 'ppa:'
# <file path>
@@ -92,6 +94,7 @@ KEYPAIR_NAME = None
##################################################################
# Bring in any user-file defined settings
try:
+ # pylint: disable=wildcard-import,unused-wildcard-import
from tests.integration_tests.user_settings import * # noqa
except ImportError:
pass