integration tests: keep openshift_version happy

10 files changed, 18 insertions, 55 deletions

diff --git a/roles/openshift_health_checker/meta/main.yml b/roles/openshift_health_checker/meta/main.yml
index 4d141974c..ed97d539c 100644
--- a/roles/openshift_health_checker/meta/main.yml
+++ b/roles/openshift_health_checker/meta/main.yml
@@ -1,5 +1 @@
 ---
-dependencies:
-  - role: openshift_facts
-  - role: openshift_repos
-  - role: openshift_version
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 a557282b4..9875de9aa 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
@@ -8,12 +8,6 @@
 
 - name: Fail as required packages cannot be installed
   hosts: all
-  pre_tasks:
-
-    # run before roles to prevent openshift_version breaking
-    - include: tasks/enable_repo.yml
-      vars: { repo_name: "ose-3.2" }
-
   roles:
     - openshift_health_checker
 
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 0929b73ce..9f3aad7bd 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
@@ -8,12 +8,6 @@
 
 - name: Fails when a dependency required for update is missing
   hosts: all
-  pre_tasks:
-
-    # run before roles to prevent openshift_version breaking
-    - include: tasks/enable_repo.yml
-      vars: { repo_name: "ose-3.2" }
-
   roles:
     - openshift_health_checker
 
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 f8790358a..84e9360f5 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
@@ -8,12 +8,6 @@
 
 - name: Fails when a repo definition is completely broken
   hosts: all
-  pre_tasks:
-
-    # run before roles to prevent openshift_version breaking
-    - include: tasks/enable_repo.yml
-      vars: { repo_name: "ose-3.2" }
-
   roles:
     - openshift_health_checker
 
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 e2bb84715..f4c1bedfa 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
@@ -8,12 +8,6 @@
 
 - name: Succeeds when nothing blocks a yum update
   hosts: all
-  pre_tasks:
-
-    # run before roles to prevent openshift_version breaking
-    - include: tasks/enable_repo.yml
-      vars: { repo_name: "ose-3.2" }
-
   roles:
     - openshift_health_checker
 
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 28efdd81d..409057792 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
@@ -8,12 +8,6 @@
 
 - name: Fails when repo content is not available
   hosts: all
-  pre_tasks:
-
-    # run before roles to prevent openshift_version breaking
-    - include: tasks/enable_repo.yml
-      vars: { repo_name: "ose-3.2" }
-
   roles:
     - openshift_health_checker
 
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 58bed0fc0..d88f82a4a 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
@@ -8,12 +8,6 @@
 
 - name: Success when AOS version matches openshift_release
   hosts: all
-  pre_tasks:
-
-    # run before roles to prevent openshift_version breaking
-    - include: tasks/enable_repo.yml
-      vars: { repo_name: "ose-3.2" }
-
   roles:
     - openshift_health_checker
 
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 c26413009..401ad1e21 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
@@ -5,16 +5,10 @@
     image: preflight-aos-package-checks
     l_host_vars:
       deployment_type: openshift-enterprise
-      openshift_release: 3.3
+      openshift_release: 3.2
 
 - name: Failure when AOS version doesn't match openshift_release
   hosts: all
-  pre_tasks:
-
-    # run before roles to prevent openshift_version breaking
-    - include: tasks/enable_repo.yml
-      vars: { repo_name: "ose-3.3" }
-
   roles:
     - openshift_health_checker
 
@@ -23,10 +17,10 @@
 
         # put the repo back to disabled
         - include: tasks/enable_repo.yml
-          vars: { repo_name: "ose-3.3", repo_enabled: 0 }
+          vars: { repo_name: "ose-3.2", repo_enabled: 0 }
         # test with wrong repo enabled
         - include: tasks/enable_repo.yml
-          vars: { repo_name: "ose-3.2" }
+          vars: { repo_name: "ose-3.3" }
         - action: openshift_health_check
           args:
             checks: [ 'package_version' ]
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 850a55a72..88613802b 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
@@ -7,12 +7,6 @@
 
 - name: Fails when multiple AOS versions are available
   hosts: all
-  pre_tasks:
-
-    # run before roles to prevent openshift_version breaking
-    - include: tasks/enable_repo.yml
-      vars: { repo_name: "ose-3.2" }
-
   roles:
     - openshift_health_checker
 
diff --git a/test/integration/openshift_health_checker/setup_container.yml b/test/integration/openshift_health_checker/setup_container.yml
index d1f8f3f52..90b2d6a4b 100644
--- a/test/integration/openshift_health_checker/setup_container.yml
+++ b/test/integration/openshift_health_checker/setup_container.yml
@@ -44,5 +44,20 @@
       delegate_to: "{{ container_name }}"
       with_dict: "{{ l_host_vars | default({}) }}"
 
+- hosts: all
+  tasks: 
+
+    # run before openshift_version to prevent it breaking
+    - include: 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
+
+- hosts: all
+  tasks:
+
+    # put it back like it was for the tests
+    - include: preflight/playbooks/tasks/enable_repo.yml
+      vars: { repo_name: "ose-3.2", enabled: False }
+