move excluder upgrade validation tasks under openshift_excluder role

2 files changed, 44 insertions, 0 deletions

diff --git a/roles/openshift_excluder/tasks/verify_excluder.yml b/roles/openshift_excluder/tasks/verify_excluder.yml
new file mode 100644
index 000000000..24a05d56e
--- /dev/null
+++ b/roles/openshift_excluder/tasks/verify_excluder.yml
@@ -0,0 +1,29 @@
+---
+# input variables:
+# - repoquery_cmd
+# - excluder
+# - openshift_upgrade_target
+- block:
+  - name: Get available excluder version
+    command: >
+      {{ repoquery_cmd }} --qf '%{version}' "{{ excluder }}"
+    register: excluder_version
+    failed_when: false
+    changed_when: false
+
+  - name: "{{ excluder }} version detected"
+    debug:
+      msg: "{{ excluder }}: {{ excluder_version.stdout }}"
+
+  - name: Printing upgrade target version
+    debug:
+      msg: "{{ openshift_upgrade_target }}"
+
+  - name: Check the available {{ excluder }} version is at most of the upgrade target version
+    fail:
+      msg: "Available {{ excluder }} version {{ excluder_version.stdout }} is higher than the upgrade target version"
+    when:
+    - "{{ excluder_version.stdout != '' }}"
+    - "{{ excluder_version.stdout.split('.')[0:2] | join('.') | version_compare(openshift_upgrade_target.split('.')[0:2] | join('.'), '>', strict=True) }}"
+  when:
+  - not openshift.common.is_atomic | bool
diff --git a/roles/openshift_excluder/tasks/verify_upgrade.yml b/roles/openshift_excluder/tasks/verify_upgrade.yml
new file mode 100644
index 000000000..6ea2130ac
--- /dev/null
+++ b/roles/openshift_excluder/tasks/verify_upgrade.yml
@@ -0,0 +1,15 @@
+---
+# input variables
+# - repoquery_cmd
+# - openshift_upgrade_target
+- include: init.yml
+
+- include: verify_excluder.yml
+  vars:
+    excluder: "{{ openshift.common.service_type }}-docker-excluder"
+  when: docker_excluder_on
+
+- include: verify_excluder.yml
+  vars:
+    excluder: "{{ openshift.common.service_type }}-excluder"
+  when: openshift_excluder_on