summaryrefslogtreecommitdiffstats
path: root/test/integration
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-12-08 07:44:53 -0800
committerGitHub <noreply@github.com>2017-12-08 07:44:53 -0800
commit0beab180d22f28f3f529ca0252f23bb92a7b69a7 (patch)
treeb7e8ab9f8a76878964d7b4edc7ffe9cdb232f7ad /test/integration
parent5cd32d44a6a776f4364742b039666932967c7ba8 (diff)
parent7834423c6da99fdf5179d3fee11a94bcb1b6ab6d (diff)
downloadopenshift-0beab180d22f28f3f529ca0252f23bb92a7b69a7.tar.gz
openshift-0beab180d22f28f3f529ca0252f23bb92a7b69a7.tar.bz2
openshift-0beab180d22f28f3f529ca0252f23bb92a7b69a7.tar.xz
openshift-0beab180d22f28f3f529ca0252f23bb92a7b69a7.zip
Merge pull request #6398 from mtnbikenc/update-deprecation-checks
Automatic merge from submit-queue. Update deprecation checks - include: Updating deprecation tests to check for `include:` directive usage. Trello: https://trello.com/c/ZTyZu3UM/484-3-ansible-24-include-deprecation Fixes: https://github.com/openshift/openshift-ansible/issues/5586
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/openshift_health_checker/preflight/playbooks/package_availability_missing_required.yml6
-rw-r--r--test/integration/openshift_health_checker/preflight/playbooks/package_availability_succeeds.yml4
-rw-r--r--test/integration/openshift_health_checker/preflight/playbooks/package_update_dep_missing.yml6
-rw-r--r--test/integration/openshift_health_checker/preflight/playbooks/package_update_repo_broken.yml6
-rw-r--r--test/integration/openshift_health_checker/preflight/playbooks/package_update_repo_disabled.yml4
-rw-r--r--test/integration/openshift_health_checker/preflight/playbooks/package_update_repo_unreachable.yml6
-rw-r--r--test/integration/openshift_health_checker/preflight/playbooks/package_version_matches.yml6
-rw-r--r--test/integration/openshift_health_checker/preflight/playbooks/package_version_mismatches.yml8
-rw-r--r--test/integration/openshift_health_checker/preflight/playbooks/package_version_multiple.yml8
-rw-r--r--test/integration/openshift_health_checker/preflight/playbooks/package_version_origin.yml4
-rw-r--r--test/integration/openshift_health_checker/setup_container.yml6
11 files changed, 32 insertions, 32 deletions
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 cda69408d..0f0f8d366 100644
--- a/test/integration/openshift_health_checker/setup_container.yml
+++ b/test/integration/openshift_health_checker/setup_container.yml
@@ -47,14 +47,14 @@
- 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/init/main.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 }