Merge pull request #5413 from ingvagabund/disable-excluders-after-pre-checks

Automatic merge from submit-queue

Move some pre-checks before excluders are disabled

Some pre-checks needs an OCP version which is detected by a set of tasks that need the excluders to be disabled. So at the best I can move some pre-checks before the excluders are disabled. However, there will be still some checks that can fail with excluders updated to the newer version.

Bug: 1484304

playbooks/common/openshift-cluster/upgrades/v3_5/upgrade.yml

@@ -47,6 +47,10 @@
   tags:
   - pre_upgrade
 
+- include: ../pre/verify_control_plane_running.yml
+  tags:
+  - pre_upgrade
+
 - include: ../disable_master_excluders.yml
   tags:
   - pre_upgrade
@@ -71,10 +75,6 @@
     # docker is configured and running.
     skip_docker_role: True
 
-- include: ../pre/verify_control_plane_running.yml
-  tags:
-  - pre_upgrade
-
 - include: ../../../openshift-master/validate_restart.yml
   tags:
   - pre_upgrade

playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml

@@ -47,6 +47,14 @@
   tags:
   - pre_upgrade
 
+- include: ../pre/verify_health_checks.yml
+  tags:
+  - pre_upgrade
+
+- include: ../pre/verify_control_plane_running.yml
+  tags:
+  - pre_upgrade
+
 - include: ../disable_master_excluders.yml
   tags:
   - pre_upgrade
@@ -71,14 +79,6 @@
     # docker is configured and running.
     skip_docker_role: True
 
-- include: ../pre/verify_health_checks.yml
-  tags:
-  - pre_upgrade
-
-- include: ../pre/verify_control_plane_running.yml
-  tags:
-  - pre_upgrade
-
 - include: ../../../openshift-master/validate_restart.yml
   tags:
   - pre_upgrade

playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml

@@ -47,6 +47,14 @@
   tags:
   - pre_upgrade
 
+- include: ../pre/verify_health_checks.yml
+  tags:
+  - pre_upgrade
+
+- include: ../pre/verify_control_plane_running.yml
+  tags:
+  - pre_upgrade
+
 - include: ../disable_master_excluders.yml
   tags:
   - pre_upgrade
@@ -71,14 +79,6 @@
     # docker is configured and running.
     skip_docker_role: True
 
-- include: ../pre/verify_health_checks.yml
-  tags:
-  - pre_upgrade
-
-- include: ../pre/verify_control_plane_running.yml
-  tags:
-  - pre_upgrade
-
 - include: ../../../openshift-master/validate_restart.yml
   tags:
   - pre_upgrade