diff options
Diffstat (limited to 'test')
14 files changed, 32 insertions, 110 deletions
diff --git a/test/integration/build-images.sh b/test/integration/build-images.sh index 74a55fa51..74a55fa51 100755..100644 --- a/test/integration/build-images.sh +++ b/test/integration/build-images.sh diff --git a/test/integration/openshift_health_checker/preflight/playbooks/package_availability_missing_required.yml b/test/integration/openshift_health_checker/preflight/playbooks/package_availability_missing_required.yml index 9875de9aa..006a71bd9 100644 --- a/test/integration/openshift_health_checker/preflight/playbooks/package_availability_missing_required.yml +++ b/test/integration/openshift_health_checker/preflight/playbooks/package_availability_missing_required.yml @@ -1,6 +1,6 @@ --- # NOTE: this test is probably superfluous since openshift_version already does it -- include: ../../setup_container.yml +- import_playbook: ../../setup_container.yml vars: image: preflight-aos-package-checks l_host_vars: @@ -15,7 +15,7 @@ - block: # put the repo back to disabled - - include: tasks/enable_repo.yml + - include_tasks: tasks/enable_repo.yml vars: { repo_name: "ose-3.2", repo_enabled: 0 } - action: openshift_health_check @@ -23,4 +23,4 @@ checks: [ 'package_availability' ] always: # destroy the container whether check passed or not - - include: ../../teardown_container.yml + - include_tasks: ../../teardown_container.yml diff --git a/test/integration/openshift_health_checker/preflight/playbooks/package_availability_succeeds.yml b/test/integration/openshift_health_checker/preflight/playbooks/package_availability_succeeds.yml index 16ff41673..b4f18e3b5 100644 --- a/test/integration/openshift_health_checker/preflight/playbooks/package_availability_succeeds.yml +++ b/test/integration/openshift_health_checker/preflight/playbooks/package_availability_succeeds.yml @@ -1,5 +1,5 @@ --- -- include: ../../setup_container.yml +- import_playbook: ../../setup_container.yml vars: image: preflight-aos-package-checks l_host_vars: @@ -17,4 +17,4 @@ checks: [ 'package_availability' ] always: # destroy the container whether check passed or not - - include: ../../teardown_container.yml + - include_tasks: ../../teardown_container.yml diff --git a/test/integration/openshift_health_checker/preflight/playbooks/package_update_dep_missing.yml b/test/integration/openshift_health_checker/preflight/playbooks/package_update_dep_missing.yml index 9f3aad7bd..7998023ae 100644 --- a/test/integration/openshift_health_checker/preflight/playbooks/package_update_dep_missing.yml +++ b/test/integration/openshift_health_checker/preflight/playbooks/package_update_dep_missing.yml @@ -1,5 +1,5 @@ --- -- include: ../../setup_container.yml +- import_playbook: ../../setup_container.yml vars: image: preflight-aos-package-checks l_host_vars: @@ -14,7 +14,7 @@ post_tasks: - block: - - include: tasks/enable_repo.yml + - include_tasks: tasks/enable_repo.yml vars: { repo_name: "break-yum" } - action: openshift_health_check @@ -22,4 +22,4 @@ checks: [ 'package_update' ] always: # destroy the container whether check passed or not - - include: ../../teardown_container.yml + - include_tasks: ../../teardown_container.yml diff --git a/test/integration/openshift_health_checker/preflight/playbooks/package_update_repo_broken.yml b/test/integration/openshift_health_checker/preflight/playbooks/package_update_repo_broken.yml index 84e9360f5..3b8b15ff3 100644 --- a/test/integration/openshift_health_checker/preflight/playbooks/package_update_repo_broken.yml +++ b/test/integration/openshift_health_checker/preflight/playbooks/package_update_repo_broken.yml @@ -1,5 +1,5 @@ --- -- include: ../../setup_container.yml +- import_playbook: ../../setup_container.yml vars: image: preflight-aos-package-checks l_host_vars: @@ -14,7 +14,7 @@ post_tasks: - block: - - include: tasks/enable_repo.yml + - include_tasks: tasks/enable_repo.yml vars: { repo_name: "break-yum" } - name: Break the break-yum repo @@ -29,4 +29,4 @@ checks: [ 'package_update' ] always: # destroy the container whether check passed or not - - include: ../../teardown_container.yml + - include_tasks: ../../teardown_container.yml diff --git a/test/integration/openshift_health_checker/preflight/playbooks/package_update_repo_disabled.yml b/test/integration/openshift_health_checker/preflight/playbooks/package_update_repo_disabled.yml index f4c1bedfa..269c0250b 100644 --- a/test/integration/openshift_health_checker/preflight/playbooks/package_update_repo_disabled.yml +++ b/test/integration/openshift_health_checker/preflight/playbooks/package_update_repo_disabled.yml @@ -1,5 +1,5 @@ --- -- include: ../../setup_container.yml +- import_playbook: ../../setup_container.yml vars: image: preflight-aos-package-checks l_host_vars: @@ -19,4 +19,4 @@ checks: [ 'package_update' ] always: # destroy the container whether check passed or not - - include: ../../teardown_container.yml + - include_tasks: ../../teardown_container.yml diff --git a/test/integration/openshift_health_checker/preflight/playbooks/package_update_repo_unreachable.yml b/test/integration/openshift_health_checker/preflight/playbooks/package_update_repo_unreachable.yml index 409057792..92408a669 100644 --- a/test/integration/openshift_health_checker/preflight/playbooks/package_update_repo_unreachable.yml +++ b/test/integration/openshift_health_checker/preflight/playbooks/package_update_repo_unreachable.yml @@ -1,5 +1,5 @@ --- -- include: ../../setup_container.yml +- import_playbook: ../../setup_container.yml vars: image: preflight-aos-package-checks l_host_vars: @@ -14,7 +14,7 @@ post_tasks: - block: - - include: tasks/enable_repo.yml + - include_tasks: tasks/enable_repo.yml vars: { repo_name: "break-yum" } - name: Remove the local repo entirely @@ -25,4 +25,4 @@ checks: [ 'package_update' ] always: # destroy the container whether check passed or not - - include: ../../teardown_container.yml + - include_tasks: ../../teardown_container.yml diff --git a/test/integration/openshift_health_checker/preflight/playbooks/package_version_matches.yml b/test/integration/openshift_health_checker/preflight/playbooks/package_version_matches.yml index d88f82a4a..4e2b8a50c 100644 --- a/test/integration/openshift_health_checker/preflight/playbooks/package_version_matches.yml +++ b/test/integration/openshift_health_checker/preflight/playbooks/package_version_matches.yml @@ -1,5 +1,5 @@ --- -- include: ../../setup_container.yml +- import_playbook: ../../setup_container.yml vars: image: preflight-aos-package-checks l_host_vars: @@ -15,7 +15,7 @@ - block: # disable extras so we control docker version - - include: tasks/enable_repo.yml + - include_tasks: tasks/enable_repo.yml vars: { repo_file: "CentOS-Base", repo_name: "extras", repo_enabled: 0 } - action: openshift_health_check @@ -23,4 +23,4 @@ checks: [ 'package_version' ] always: # destroy the container whether check passed or not - - include: ../../teardown_container.yml + - include_tasks: ../../teardown_container.yml diff --git a/test/integration/openshift_health_checker/preflight/playbooks/package_version_mismatches.yml b/test/integration/openshift_health_checker/preflight/playbooks/package_version_mismatches.yml index 401ad1e21..e1f8d74e6 100644 --- a/test/integration/openshift_health_checker/preflight/playbooks/package_version_mismatches.yml +++ b/test/integration/openshift_health_checker/preflight/playbooks/package_version_mismatches.yml @@ -1,6 +1,6 @@ --- # NOTE: this test is probably superfluous since openshift_version already does it -- include: ../../setup_container.yml +- import_playbook: ../../setup_container.yml vars: image: preflight-aos-package-checks l_host_vars: @@ -16,14 +16,14 @@ - block: # put the repo back to disabled - - include: tasks/enable_repo.yml + - include_tasks: tasks/enable_repo.yml vars: { repo_name: "ose-3.2", repo_enabled: 0 } # test with wrong repo enabled - - include: tasks/enable_repo.yml + - include_tasks: tasks/enable_repo.yml vars: { repo_name: "ose-3.3" } - action: openshift_health_check args: checks: [ 'package_version' ] always: # destroy the container whether check passed or not - - include: ../../teardown_container.yml + - include_tasks: ../../teardown_container.yml diff --git a/test/integration/openshift_health_checker/preflight/playbooks/package_version_multiple.yml b/test/integration/openshift_health_checker/preflight/playbooks/package_version_multiple.yml index 88613802b..600bbe9c3 100644 --- a/test/integration/openshift_health_checker/preflight/playbooks/package_version_multiple.yml +++ b/test/integration/openshift_health_checker/preflight/playbooks/package_version_multiple.yml @@ -1,5 +1,5 @@ --- -- include: ../../setup_container.yml +- import_playbook: ../../setup_container.yml vars: image: preflight-aos-package-checks l_host_vars: @@ -14,11 +14,11 @@ - block: # enable repo with extra minor version available - - include: tasks/enable_repo.yml + - include_tasks: tasks/enable_repo.yml vars: { repo_name: "ose-3.3" } # disable extras so we control docker version - - include: tasks/enable_repo.yml + - include_tasks: tasks/enable_repo.yml vars: { repo_file: "CentOS-Base", repo_name: "extras", repo_enabled: 0 } - action: openshift_health_check @@ -26,4 +26,4 @@ checks: [ 'package_version' ] always: # destroy the container whether check passed or not - - include: ../../teardown_container.yml + - include_tasks: ../../teardown_container.yml diff --git a/test/integration/openshift_health_checker/preflight/playbooks/package_version_origin.yml b/test/integration/openshift_health_checker/preflight/playbooks/package_version_origin.yml index da3f6b844..079ca4253 100644 --- a/test/integration/openshift_health_checker/preflight/playbooks/package_version_origin.yml +++ b/test/integration/openshift_health_checker/preflight/playbooks/package_version_origin.yml @@ -1,5 +1,5 @@ --- -- include: ../../setup_container.yml +- import_playbook: ../../setup_container.yml vars: image: preflight-aos-package-checks l_host_vars: @@ -17,4 +17,4 @@ checks: [ 'package_version' ] always: # destroy the container whether check passed or not - - include: ../../teardown_container.yml + - include_tasks: ../../teardown_container.yml diff --git a/test/integration/openshift_health_checker/setup_container.yml b/test/integration/openshift_health_checker/setup_container.yml index 413754fcd..0f0f8d366 100644 --- a/test/integration/openshift_health_checker/setup_container.yml +++ b/test/integration/openshift_health_checker/setup_container.yml @@ -46,17 +46,15 @@ - hosts: all tasks: - # run before openshift_version to prevent it breaking - - include: preflight/playbooks/tasks/enable_repo.yml + - include_tasks: preflight/playbooks/tasks/enable_repo.yml vars: { repo_name: "ose-3.2" } -- include: ../../../playbooks/byo/openshift-cluster/initialize_groups.yml -- include: ../../../playbooks/common/openshift-cluster/std_include.yml +- import_playbook: ../../../playbooks/init/main.yml - hosts: all tasks: # put it back like it was for the tests - - include: preflight/playbooks/tasks/enable_repo.yml + - include_tasks: preflight/playbooks/tasks/enable_repo.yml vars: { repo_name: "ose-3.2", enabled: False } diff --git a/test/integration/run-tests.sh b/test/integration/run-tests.sh index 680b64602..680b64602 100755..100644 --- a/test/integration/run-tests.sh +++ b/test/integration/run-tests.sh diff --git a/test/openshift_version_tests.py b/test/openshift_version_tests.py deleted file mode 100644 index 6095beb95..000000000 --- a/test/openshift_version_tests.py +++ /dev/null @@ -1,76 +0,0 @@ -""" Tests for the openshift_version Ansible filter module. """ -# pylint: disable=missing-docstring,invalid-name - -import os -import sys -import unittest - -sys.path = [os.path.abspath(os.path.dirname(__file__) + "/../filter_plugins/")] + sys.path - -# pylint: disable=import-error -import openshift_version # noqa: E402 - - -class OpenShiftVersionTests(unittest.TestCase): - - openshift_version_filters = openshift_version.FilterModule() - - # Static tests for legacy filters. - legacy_gte_tests = [{'name': 'oo_version_gte_3_1_or_1_1', - 'positive_openshift-enterprise_version': '3.2.0', - 'negative_openshift-enterprise_version': '3.0.0', - 'positive_origin_version': '1.2.0', - 'negative_origin_version': '1.0.0'}, - {'name': 'oo_version_gte_3_1_1_or_1_1_1', - 'positive_openshift-enterprise_version': '3.2.0', - 'negative_openshift-enterprise_version': '3.1.0', - 'positive_origin_version': '1.2.0', - 'negative_origin_version': '1.1.0'}, - {'name': 'oo_version_gte_3_2_or_1_2', - 'positive_openshift-enterprise_version': '3.3.0', - 'negative_openshift-enterprise_version': '3.1.0', - 'positive_origin_version': '1.3.0', - 'negative_origin_version': '1.1.0'}, - {'name': 'oo_version_gte_3_3_or_1_3', - 'positive_openshift-enterprise_version': '3.4.0', - 'negative_openshift-enterprise_version': '3.2.0', - 'positive_origin_version': '1.4.0', - 'negative_origin_version': '1.2.0'}, - {'name': 'oo_version_gte_3_4_or_1_4', - 'positive_openshift-enterprise_version': '3.5.0', - 'negative_openshift-enterprise_version': '3.3.0', - 'positive_origin_version': '1.5.0', - 'negative_origin_version': '1.3.0'}, - {'name': 'oo_version_gte_3_5_or_1_5', - 'positive_openshift-enterprise_version': '3.6.0', - 'negative_openshift-enterprise_version': '3.4.0', - 'positive_origin_version': '3.6.0', - 'negative_origin_version': '1.4.0'}] - - def test_legacy_gte_filters(self): - for test in self.legacy_gte_tests: - for deployment_type in ['openshift-enterprise', 'origin']: - # Test negative case per deployment_type - self.assertFalse( - self.openshift_version_filters._filters[test['name']]( - test["negative_{}_version".format(deployment_type)], deployment_type)) - # Test positive case per deployment_type - self.assertTrue( - self.openshift_version_filters._filters[test['name']]( - test["positive_{}_version".format(deployment_type)], deployment_type)) - - def test_gte_filters(self): - for major, minor_start, minor_end in self.openshift_version_filters.versions: - for minor in range(minor_start, minor_end): - # Test positive case - self.assertTrue( - self.openshift_version_filters._filters["oo_version_gte_{}_{}".format(major, minor)]( - "{}.{}".format(major, minor + 1))) - # Test negative case - self.assertFalse( - self.openshift_version_filters._filters["oo_version_gte_{}_{}".format(major, minor)]( - "{}.{}".format(major, minor))) - - def test_get_filters(self): - self.assertTrue( - self.openshift_version_filters.filters() == self.openshift_version_filters._filters) |