diff options
| author | Russell Teague <rteague@redhat.com> | 2017-01-31 08:05:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-31 08:05:03 -0500 |
| commit | fca215887b2e4224779b58e8fd1b7662ec993f83 (patch) | |
| tree | a8862a16c39d54dc5f123fff532904da371794e1 /roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py | |
| parent | e6bec56b75baa631cdb4902d29cca811db91e9f1 (diff) | |
| parent | bc2ba98351a4b45a18813cf2dc2cd58f098bc1d3 (diff) | |
| download | openshift-fca215887b2e4224779b58e8fd1b7662ec993f83.tar.gz openshift-fca215887b2e4224779b58e8fd1b7662ec993f83.tar.bz2 openshift-fca215887b2e4224779b58e8fd1b7662ec993f83.tar.xz openshift-fca215887b2e4224779b58e8fd1b7662ec993f83.zip | |
Merge pull request #3194 from mtnbikenc/upgrade-3_5-fork
Create v3_5 upgrade playbooks
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.py | 16 |
1 files changed, 15 insertions, 1 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 5427a07a1..4e44a2b3d 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 @@ -40,6 +40,16 @@ DEFAULT_PRIORITIES_1_4 = [ {'name': 'InterPodAffinityPriority', 'weight': 1} ] +DEFAULT_PRIORITIES_1_5 = [ + {'name': 'SelectorSpreadPriority', 'weight': 1}, + {'name': 'InterPodAffinityPriority', 'weight': 1}, + {'name': 'LeastRequestedPriority', 'weight': 1}, + {'name': 'BalancedResourceAllocation', 'weight': 1}, + {'name': 'NodePreferAvoidPodsPriority', 'weight': 10000}, + {'name': 'NodeAffinityPriority', 'weight': 1}, + {'name': 'TaintTolerationPriority', 'weight': 1} +] + ZONE_PRIORITY = { 'name': 'Zone', 'argument': { @@ -58,7 +68,11 @@ TEST_VARS = [ ('1.3', 'origin', DEFAULT_PRIORITIES_1_3), ('3.3', 'openshift-enterprise', DEFAULT_PRIORITIES_1_3), ('1.4', 'origin', DEFAULT_PRIORITIES_1_4), - ('3.4', 'openshift-enterprise', DEFAULT_PRIORITIES_1_4) + ('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', 'openshift-enterprise', DEFAULT_PRIORITIES_1_5), ] |