summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-04-25 10:20:39 -0400
committerRussell Teague <rteague@redhat.com>2017-04-25 15:41:36 -0400
commit51ffcb739c1ebf9872aa3f45a905b087ae9e0f48 (patch)
treefccf877403a58bbd52c8200cdd3541dddb37e747 /roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py
parentd4d143778596087175f1bd5339a1bed1288e8520 (diff)
downloadopenshift-51ffcb739c1ebf9872aa3f45a905b087ae9e0f48.tar.gz
openshift-51ffcb739c1ebf9872aa3f45a905b087ae9e0f48.tar.bz2
openshift-51ffcb739c1ebf9872aa3f45a905b087ae9e0f48.tar.xz
openshift-51ffcb739c1ebf9872aa3f45a905b087ae9e0f48.zip
Standardize all Origin versioning on 3.6
Diffstat (limited to 'roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py')
-rw-r--r--roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py b/roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py
index 1098f9391..97ef2387e 100644
--- a/roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py
+++ b/roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py
@@ -42,6 +42,8 @@ DEFAULT_PRIORITIES_1_5 = [
{'name': 'TaintTolerationPriority', 'weight': 1}
]
+DEFAULT_PRIORITIES_3_6 = DEFAULT_PRIORITIES_1_5
+
ZONE_PRIORITY = {
'name': 'Zone',
'argument': {
@@ -63,9 +65,8 @@ TEST_VARS = [
('3.4', 'openshift-enterprise', DEFAULT_PRIORITIES_1_4),
('1.5', 'origin', DEFAULT_PRIORITIES_1_5),
('3.5', 'openshift-enterprise', DEFAULT_PRIORITIES_1_5),
- ('1.6', 'origin', DEFAULT_PRIORITIES_1_5),
- ('3.6', 'origin', DEFAULT_PRIORITIES_1_5),
- ('3.6', 'openshift-enterprise', DEFAULT_PRIORITIES_1_5),
+ ('3.6', 'origin', DEFAULT_PRIORITIES_3_6),
+ ('3.6', 'openshift-enterprise', DEFAULT_PRIORITIES_3_6),
]