summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Munilla <smunilla@redhat.com>2016-08-16 14:48:41 -0400
committerSamuel Munilla <smunilla@redhat.com>2016-08-16 14:55:06 -0400
commit7869c59bcefe40a37470ba06e8ba0982eea46610 (patch)
treef37a7dee4d8b6481d63a3428d164e73ae23d71c5
parentbdf12ce1512ec5467cf668b0a7c8553a4dab92d1 (diff)
downloadopenshift-7869c59bcefe40a37470ba06e8ba0982eea46610.tar.gz
openshift-7869c59bcefe40a37470ba06e8ba0982eea46610.tar.bz2
openshift-7869c59bcefe40a37470ba06e8ba0982eea46610.tar.xz
openshift-7869c59bcefe40a37470ba06e8ba0982eea46610.zip
a-o-i: Fix nosetests after removing 3.2 from installer
Update the tests to match 3.3 being the only version. Add support for non-latest if it's specified in the config file.
-rw-r--r--utils/src/ooinstall/variants.py10
-rw-r--r--utils/test/cli_installer_tests.py6
-rw-r--r--utils/test/fixture.py2
-rw-r--r--utils/test/oo_config_tests.py2
4 files changed, 14 insertions, 6 deletions
diff --git a/utils/src/ooinstall/variants.py b/utils/src/ooinstall/variants.py
index dc25fae8f..b32370cd5 100644
--- a/utils/src/ooinstall/variants.py
+++ b/utils/src/ooinstall/variants.py
@@ -46,8 +46,16 @@ origin = Variant('origin', 'OpenShift Origin',
]
)
+LEGACY = Variant('openshift-enterprise', 'OpenShift Container Platform',
+ [
+ Version('3.2', 'openshift-enterprise'),
+ Version('3.1', 'openshift-enterprise'),
+ Version('3.0', 'openshift-enterprise'),
+ ]
+)
+
# Ordered list of variants we can install, first is the default.
-SUPPORTED_VARIANTS = (OSE, origin)
+SUPPORTED_VARIANTS = (OSE, origin, LEGACY)
DISPLAY_VARIANTS = (OSE, )
def find_variant(name, version=None):
diff --git a/utils/test/cli_installer_tests.py b/utils/test/cli_installer_tests.py
index 98e111043..5944bbe81 100644
--- a/utils/test/cli_installer_tests.py
+++ b/utils/test/cli_installer_tests.py
@@ -557,7 +557,7 @@ class UnattendedCliTests(OOCliFixture):
self.assertEquals('openshift-enterprise', written_config['variant'])
# We didn't specify a version so the latest should have been assumed,
# and written to disk:
- self.assertEquals('3.2', written_config['variant_version'])
+ self.assertEquals('3.3', written_config['variant_version'])
# Make sure the correct value was passed to ansible:
inventory = ConfigParser.ConfigParser(allow_no_value=True)
@@ -573,7 +573,7 @@ class UnattendedCliTests(OOCliFixture):
run_playbook_mock.return_value = 0
config = SAMPLE_CONFIG % 'openshift-enterprise'
- config = '%s\n%s' % (config, 'variant_version: 3.2')
+ config = '%s\n%s' % (config, 'variant_version: 3.3')
config_file = self.write_config(os.path.join(self.work_dir,
'ooinstall.conf'), config)
@@ -586,7 +586,7 @@ class UnattendedCliTests(OOCliFixture):
self.assertEquals('openshift-enterprise', written_config['variant'])
# Make sure our older version was preserved:
# and written to disk:
- self.assertEquals('3.2', written_config['variant_version'])
+ self.assertEquals('3.3', written_config['variant_version'])
inventory = ConfigParser.ConfigParser(allow_no_value=True)
inventory.read(os.path.join(self.work_dir, 'hosts'))
diff --git a/utils/test/fixture.py b/utils/test/fixture.py
index ddf6b6802..b2a0a7134 100644
--- a/utils/test/fixture.py
+++ b/utils/test/fixture.py
@@ -10,7 +10,7 @@ from click.testing import CliRunner
# Substitute in a product name before use:
SAMPLE_CONFIG = """
variant: %s
-variant_version: 3.2
+variant_version: 3.3
master_routingconfig_subdomain: example.com
deployment:
ansible_ssh_user: root
diff --git a/utils/test/oo_config_tests.py b/utils/test/oo_config_tests.py
index 10439c9ae..f82d55b05 100644
--- a/utils/test/oo_config_tests.py
+++ b/utils/test/oo_config_tests.py
@@ -12,7 +12,7 @@ from ooinstall.oo_config import OOConfig, Host, OOConfigInvalidHostError
SAMPLE_CONFIG = """
variant: openshift-enterprise
-variant_version: 3.2
+variant_version: 3.3
deployment:
ansible_ssh_user: root
hosts: