From bc2ba98351a4b45a18813cf2dc2cd58f098bc1d3 Mon Sep 17 00:00:00 2001
From: Russell Teague <rteague@redhat.com>
Date: Thu, 26 Jan 2017 11:36:58 -0500
Subject: Create v3_5 upgrade playbooks

---
 ...nshift_master_facts_default_predicates_tests.py | 23 ++++++++++++++++++----
 ...nshift_master_facts_default_priorities_tests.py | 16 ++++++++++++++-
 2 files changed, 34 insertions(+), 5 deletions(-)

(limited to 'roles/openshift_master_facts/test')

diff --git a/roles/openshift_master_facts/test/openshift_master_facts_default_predicates_tests.py b/roles/openshift_master_facts/test/openshift_master_facts_default_predicates_tests.py
index 07bac6826..68b6deb88 100644
--- a/roles/openshift_master_facts/test/openshift_master_facts_default_predicates_tests.py
+++ b/roles/openshift_master_facts/test/openshift_master_facts_default_predicates_tests.py
@@ -9,6 +9,9 @@ sys.path = [os.path.abspath(os.path.dirname(__file__) + "/../lookup_plugins/")]
 
 from openshift_master_facts_default_predicates import LookupModule  # noqa: E402
 
+# Predicates ordered according to OpenShift Origin source:
+# origin/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go
+
 DEFAULT_PREDICATES_1_1 = [
     {'name': 'PodFitsHostPorts'},
     {'name': 'PodFitsResources'},
@@ -48,6 +51,18 @@ DEFAULT_PREDICATES_1_4 = [
     {'name': 'MatchInterPodAffinity'}
 ]
 
+DEFAULT_PREDICATES_1_5 = [
+    {'name': 'NoVolumeZoneConflict'},
+    {'name': 'MaxEBSVolumeCount'},
+    {'name': 'MaxGCEPDVolumeCount'},
+    {'name': 'MatchInterPodAffinity'},
+    {'name': 'NoDiskConflict'},
+    {'name': 'GeneralPredicates'},
+    {'name': 'PodToleratesNodeTaints'},
+    {'name': 'CheckNodeMemoryPressure'},
+    {'name': 'CheckNodeDiskPressure'},
+]
+
 REGION_PREDICATE = {
     'name': 'Region',
     'argument': {
@@ -66,10 +81,10 @@ TEST_VARS = [
     ('3.3', 'openshift-enterprise', DEFAULT_PREDICATES_1_3),
     ('1.4', 'origin', DEFAULT_PREDICATES_1_4),
     ('3.4', 'openshift-enterprise', DEFAULT_PREDICATES_1_4),
-    ('1.5', 'origin', DEFAULT_PREDICATES_1_4),
-    ('3.5', 'openshift-enterprise', DEFAULT_PREDICATES_1_4),
-    ('1.6', 'origin', DEFAULT_PREDICATES_1_4),
-    ('3.6', 'openshift-enterprise', DEFAULT_PREDICATES_1_4),
+    ('1.5', 'origin', DEFAULT_PREDICATES_1_5),
+    ('3.5', 'openshift-enterprise', DEFAULT_PREDICATES_1_5),
+    ('1.6', 'origin', DEFAULT_PREDICATES_1_5),
+    ('3.6', 'openshift-enterprise', DEFAULT_PREDICATES_1_5),
 ]
 
 
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),
 ]
 
 
-- 
cgit v1.2.3