summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master_facts/test
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-24 16:18:29 -0500
committerGitHub <noreply@github.com>2017-02-24 16:18:29 -0500
commit77c7b1c264f6a023a61a0656899bc2121921a03c (patch)
tree1facd0de34decb86bc738a6c3f61ea5c9bd5fe1f /roles/openshift_master_facts/test
parenta46b63f8dd276a46de61127d529d108349c6fad0 (diff)
parent659826a2254f36ad06aa61c178b76410cc6d1995 (diff)
downloadopenshift-77c7b1c264f6a023a61a0656899bc2121921a03c.tar.gz
openshift-77c7b1c264f6a023a61a0656899bc2121921a03c.tar.bz2
openshift-77c7b1c264f6a023a61a0656899bc2121921a03c.tar.xz
openshift-77c7b1c264f6a023a61a0656899bc2121921a03c.zip
Merge pull request #3448 from smarterclayton/version
Prepare for origin moving to OCP version scheme
Diffstat (limited to 'roles/openshift_master_facts/test')
-rw-r--r--roles/openshift_master_facts/test/openshift_master_facts_default_predicates_tests.py1
-rw-r--r--roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py1
2 files changed, 2 insertions, 0 deletions
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 25294d91a..5a9e545a3 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
@@ -76,6 +76,7 @@ TEST_VARS = [
('1.5', 'origin', DEFAULT_PREDICATES_1_5),
('3.5', 'openshift-enterprise', DEFAULT_PREDICATES_1_5),
('1.6', 'origin', DEFAULT_PREDICATES_1_5),
+ ('3.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 cec44faa4..81d3ee19e 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
@@ -64,6 +64,7 @@ TEST_VARS = [
('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),
]