diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-12-21 13:06:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-21 13:06:27 -0500 |
| commit | 4c20c6b76f295dc83e2ce730238b7753724e7e53 (patch) | |
| tree | 4e6ff6855c6e5343e97d0864f47cb2088fe364f9 /utils/src/ooinstall/variants.py | |
| parent | 3e5f3380ccacc654450924fca830b93fda6c7592 (diff) | |
| parent | 7d02b608de839cb57e2071e9d55052957c13aae3 (diff) | |
| download | openshift-4c20c6b76f295dc83e2ce730238b7753724e7e53.tar.gz openshift-4c20c6b76f295dc83e2ce730238b7753724e7e53.tar.bz2 openshift-4c20c6b76f295dc83e2ce730238b7753724e7e53.tar.xz openshift-4c20c6b76f295dc83e2ce730238b7753724e7e53.zip | |
Merge pull request #3001 from detiber/python3
python3 support, add tox for better local testing against multiple python versions
Diffstat (limited to 'utils/src/ooinstall/variants.py')
| -rw-r--r-- | utils/src/ooinstall/variants.py | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/utils/src/ooinstall/variants.py b/utils/src/ooinstall/variants.py index 39772bb2e..a45be98bf 100644 --- a/utils/src/ooinstall/variants.py +++ b/utils/src/ooinstall/variants.py @@ -38,32 +38,24 @@ class Variant(object): # WARNING: Keep the versions ordered, most recent first: -OSE = Variant('openshift-enterprise', 'OpenShift Container Platform', - [ - Version('3.4', 'openshift-enterprise'), - ] -) - -REG = Variant('openshift-enterprise', 'Registry', - [ - Version('3.4', 'openshift-enterprise', 'registry'), - ] -) - -origin = Variant('origin', 'OpenShift Origin', - [ - Version('1.4', 'origin'), - ] -) - -LEGACY = Variant('openshift-enterprise', 'OpenShift Container Platform', - [ - Version('3.3', 'openshift-enterprise'), - Version('3.2', 'openshift-enterprise'), - Version('3.1', 'openshift-enterprise'), - Version('3.0', 'openshift-enterprise'), - ] -) +OSE = Variant('openshift-enterprise', 'OpenShift Container Platform', [ + Version('3.4', 'openshift-enterprise'), +]) + +REG = Variant('openshift-enterprise', 'Registry', [ + Version('3.4', 'openshift-enterprise', 'registry'), +]) + +origin = Variant('origin', 'OpenShift Origin', [ + Version('1.4', 'origin'), +]) + +LEGACY = Variant('openshift-enterprise', 'OpenShift Container Platform', [ + Version('3.3', 'openshift-enterprise'), + 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, REG, origin, LEGACY) |