summaryrefslogtreecommitdiffstats
path: root/utils/src
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-16 15:38:14 -0400
committerGitHub <noreply@github.com>2016-08-16 15:38:14 -0400
commita6c1b382289f5e56c4591c952afed71ad130bbe6 (patch)
treef02e7fce9303f21033ce88cc29e737d07460b7cd /utils/src
parent65cbffc2bf3f04b0eebb4a59d1f7a8e55ef96dfd (diff)
parent7869c59bcefe40a37470ba06e8ba0982eea46610 (diff)
downloadopenshift-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/src')
-rw-r--r--utils/src/ooinstall/variants.py10
1 files changed, 9 insertions, 1 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):