summaryrefslogtreecommitdiffstats
path: root/utils/src
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 /utils/src
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.
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):