diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-02-06 21:53:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 21:53:36 -0500 |
| commit | 4829d3b280801ae4b8530d2de29fdcf5328e26cb (patch) | |
| tree | e898397bb84473626918e4731f9cb7a52c57f5d2 /roles/lib_utils/test | |
| parent | 9cdf6e8a3dc1d4ff399e3d85fe7e8b6d38ab92a4 (diff) | |
| parent | 5402ff05c7f5695bbe60cb6966e57a038c4fe1c0 (diff) | |
| download | openshift-4829d3b280801ae4b8530d2de29fdcf5328e26cb.tar.gz openshift-4829d3b280801ae4b8530d2de29fdcf5328e26cb.tar.bz2 openshift-4829d3b280801ae4b8530d2de29fdcf5328e26cb.tar.xz openshift-4829d3b280801ae4b8530d2de29fdcf5328e26cb.zip | |
Merge pull request #7015 from sdodson/v310
Initial support for 3.10
Diffstat (limited to 'roles/lib_utils/test')
| -rw-r--r-- | roles/lib_utils/test/openshift_master_facts_default_predicates_tests.py | 4 | ||||
| -rw-r--r-- | roles/lib_utils/test/openshift_master_facts_default_priorities_tests.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/roles/lib_utils/test/openshift_master_facts_default_predicates_tests.py b/roles/lib_utils/test/openshift_master_facts_default_predicates_tests.py index 11aad9f03..64d333d72 100644 --- a/roles/lib_utils/test/openshift_master_facts_default_predicates_tests.py +++ b/roles/lib_utils/test/openshift_master_facts_default_predicates_tests.py @@ -71,7 +71,7 @@ DEFAULT_PREDICATES_3_7 = [ {'name': 'NoVolumeNodeConflict'}, ] -DEFAULT_PREDICATES_3_9 = DEFAULT_PREDICATES_3_8 = DEFAULT_PREDICATES_3_7 +DEFAULT_PREDICATES_3_10 = DEFAULT_PREDICATES_3_9 = DEFAULT_PREDICATES_3_8 = DEFAULT_PREDICATES_3_7 REGION_PREDICATE = { 'name': 'Region', @@ -101,6 +101,8 @@ TEST_VARS = [ ('3.8', 'openshift-enterprise', DEFAULT_PREDICATES_3_8), ('3.9', 'origin', DEFAULT_PREDICATES_3_9), ('3.9', 'openshift-enterprise', DEFAULT_PREDICATES_3_9), + ('3.10', 'origin', DEFAULT_PREDICATES_3_10), + ('3.10', 'openshift-enterprise', DEFAULT_PREDICATES_3_10), ] diff --git a/roles/lib_utils/test/openshift_master_facts_default_priorities_tests.py b/roles/lib_utils/test/openshift_master_facts_default_priorities_tests.py index 527fc9ff4..4d73c7d07 100644 --- a/roles/lib_utils/test/openshift_master_facts_default_priorities_tests.py +++ b/roles/lib_utils/test/openshift_master_facts_default_priorities_tests.py @@ -44,7 +44,7 @@ DEFAULT_PRIORITIES_1_5 = [ DEFAULT_PRIORITIES_3_6 = DEFAULT_PRIORITIES_1_5 -DEFAULT_PRIORITIES_3_9 = DEFAULT_PRIORITIES_3_8 = DEFAULT_PRIORITIES_3_7 = DEFAULT_PRIORITIES_3_6 +DEFAULT_PRIORITIES_3_10 = DEFAULT_PRIORITIES_3_9 = DEFAULT_PRIORITIES_3_8 = DEFAULT_PRIORITIES_3_7 = DEFAULT_PRIORITIES_3_6 ZONE_PRIORITY = { 'name': 'Zone', @@ -75,6 +75,8 @@ TEST_VARS = [ ('3.8', 'openshift-enterprise', DEFAULT_PRIORITIES_3_8), ('3.9', 'origin', DEFAULT_PRIORITIES_3_9), ('3.9', 'openshift-enterprise', DEFAULT_PRIORITIES_3_9), + ('3.10', 'origin', DEFAULT_PRIORITIES_3_10), + ('3.10', 'openshift-enterprise', DEFAULT_PRIORITIES_3_10) ] |