diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-16 15:38:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-16 15:38:14 -0400 |
| commit | a6c1b382289f5e56c4591c952afed71ad130bbe6 (patch) | |
| tree | f02e7fce9303f21033ce88cc29e737d07460b7cd /utils | |
| parent | 65cbffc2bf3f04b0eebb4a59d1f7a8e55ef96dfd (diff) | |
| parent | 7869c59bcefe40a37470ba06e8ba0982eea46610 (diff) | |
| download | openshift-a6c1b382289f5e56c4591c952afed71ad130bbe6.tar.gz openshift-a6c1b382289f5e56c4591c952afed71ad130bbe6.tar.bz2 openshift-a6c1b382289f5e56c4591c952afed71ad130bbe6.tar.xz openshift-a6c1b382289f5e56c4591c952afed71ad130bbe6.zip | |
Merge pull request #2309 from smunilla/fix_nosetests_3.3
a-o-i: Fix nosetests after removing 3.2 from installer
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/src/ooinstall/variants.py | 10 | ||||
| -rw-r--r-- | utils/test/cli_installer_tests.py | 6 | ||||
| -rw-r--r-- | utils/test/fixture.py | 2 | ||||
| -rw-r--r-- | utils/test/oo_config_tests.py | 2 |
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: |