rename task files related only to RHEL 6 upgrade

Some of the tasks files in analysis and upgrade roles are exclusive to
upgrades of RHEL 6. These files use different tools than the rest of the
collection to perform pre-upgrade analysis (preupg) and the upgrade
itself (redhat-upgrade-tool).

This patch adds suffix to the names of these files to distinguish them
event further.

Author: PeterMocary

roles/analysis/tasks/analysis-preupg.yml …s/analysis/tasks/analysis-preupg-el6.ymlroles/analysis/tasks/analysis-preupg.yml renamed to roles/analysis/tasks/analysis-preupg-el6.yml roles/analysis/tasks/analysis-preupg.yml renamed to roles/analysis/tasks/analysis-preupg-el6.yml

@@ -1,5 +1,5 @@
 ---
-- name: analysis-preupg | Warn about limited ongoing technical support for RHEL 6
+- name: analysis-preupg-el6 | Warn about limited ongoing technical support for RHEL 6
   ansible.builtin.warn:
     msg: >-
       RHEL 6 is in the Extended Life Phase which means that the current upgrade path
@@ -8,7 +8,7 @@
       https://access.redhat.com/articles/7102732.
 
 # TODO: Having issues with community.general.redhat_subscription and subscription-manager on RHEL 6.
-- name: analysis-preupg | Register to upgrade activation key
+- name: analysis-preupg-el6 | Register to upgrade activation key
   ansible.builtin.shell: >
     export PATH={{ leapp_os_path }};
     subscription-manager register
@@ -24,15 +24,15 @@
   failed_when: false
   changed_when: true
 
-- name: analysis-preupg | Include custom_local_repos for local_repos_pre_leapp
+- name: analysis-preupg-el6 | Include custom_local_repos for local_repos_pre_leapp
   vars:
     __repos: "{{ leapp_local_repos_pre }}"
   ansible.builtin.include_role:
     name: infra.leapp.common
     tasks_from: custom_local_repos
   when: leapp_upgrade_type == "custom"
 
-- name: analysis-preupg | Enable requisite RHUI repos
+- name: analysis-preupg-el6 | Enable requisite RHUI repos
   ansible.builtin.shell: |
     set -o pipefail;
     export PATH={{ leapp_os_path }};
@@ -42,31 +42,31 @@
   failed_when: false
   changed_when: true
 
-- name: analysis-preupg | Preupgrade Assistant and Red Hat Upgrade Tool packages are latest
+- name: analysis-preupg-el6 | Preupgrade Assistant and Red Hat Upgrade Tool packages are latest
   ansible.builtin.package:
     name: "{{ leapp_analysis_packages_el6 }}"
     enablerepo: "{{ leapp_analysis_repos_el6 }}"
     state: latest # noqa package-latest
   when: leapp_upgrade_type != 'rhui'
 
-- name: analysis-preupg | Preupgrade Assistant and Red Hat Upgrade Tool packages are latest - RHUI
+- name: analysis-preupg-el6 | Preupgrade Assistant and Red Hat Upgrade Tool packages are latest - RHUI
   ansible.builtin.package:
     name: "{{ leapp_analysis_packages_el6 }}"
     state: latest # noqa package-latest
   when: leapp_upgrade_type == 'rhui'
 
-- name: analysis-preupg | Lynx is installed for text report
+- name: analysis-preupg-el6 | Lynx is installed for text report
   ansible.builtin.package:
     name: lynx
     state: present
   notify: Remove lynx package
 
-- name: analysis-preupg | Filesystem capacity checks
+- name: analysis-preupg-el6 | Filesystem capacity checks
   ansible.builtin.script: check-inodes.sh
   changed_when: false
   when: not leapp_bypass_fs_checks
 
-- name: analysis-preupg | Run preupg
+- name: analysis-preupg-el6 | Run preupg
   ansible.builtin.shell: >
     set -o pipefail;
     export PATH={{ leapp_os_path }};
@@ -80,58 +80,58 @@
   failed_when: false
   changed_when: true
 
-- name: analysis-preupg | Assert that preupg did not encounter errors
+- name: analysis-preupg-el6 | Assert that preupg did not encounter errors
   ansible.builtin.assert:
     that: not __leapp_preupg_return_codes[preupg.rc].fail
     msg: "{{ __leapp_preupg_return_codes[preupg.rc].msg }}"
 
-- name: analysis-preupg | Include custom_local_repos for local_repos_post_analysis
+- name: analysis-preupg-el6 | Include custom_local_repos for local_repos_post_analysis
   vars:
     __repos: "{{ leapp_local_repos_post_analysis }}"
   ansible.builtin.include_role:
     name: infra.leapp.common
     tasks_from: custom_local_repos
   when: leapp_upgrade_type == "custom"
 
-- name: analysis-preupg | Include check-results-file.yml
+- name: analysis-preupg-el6 | Include check-results-file.yml
   ansible.builtin.include_tasks: check-results-file.yml
 
-- name: analysis-preupg | Collect human readable report results
+- name: analysis-preupg-el6 | Collect human readable report results
   ansible.builtin.slurp:
     src: "{{ leapp_result_filename }}"
   register: results
 
-- name: analysis-preupg | Parse report results
+- name: analysis-preupg-el6 | Parse report results
   ansible.builtin.set_fact:
     preupg_report_txt: "{{ (results.content | b64decode).split('\n') }}"
 
-- name: analysis-preupg | Check for inhibitors
+- name: analysis-preupg-el6 | Check for inhibitors
   ansible.builtin.set_fact:
     upgrade_inhibited: "{{ __leapp_preupg_return_codes[preupg.rc].inhibited }}"
 
 # We already have preupg_report_txt that has this info in it.
 # However, this makes it work the same as leapp which is using
 # some awk magic to parse the file.
-- name: analysis-preupg | Collect inhibitors
+- name: analysis-preupg-el6 | Collect inhibitors
   ansible.builtin.command:
     cmd: grep "preupg.risk.EXTREME:" {{ leapp_result_filename }}
   register: results_inhibitors
   changed_when: false
   failed_when: false
 
-- name: analysis-preupg | Collect high errors
+- name: analysis-preupg-el6 | Collect high errors
   ansible.builtin.command:
     cmd: egrep -i "preupg.risk.HIGH:.*not enough free space" {{ leapp_result_filename }}
   register: results_errors
   changed_when: false
   failed_when: false
 
-- name: analysis-preupg | Check for not enough space errors and update upgrade_inhibited
+- name: analysis-preupg-el6 | Check for not enough space errors and update upgrade_inhibited
   ansible.builtin.set_fact:
     upgrade_inhibited: true
   when: results_errors.stdout_lines | length > 0
 
-- name: analysis-preupg | Capture inhibitors in a list leapp_inhibitors
+- name: analysis-preupg-el6 | Capture inhibitors in a list leapp_inhibitors
   ansible.builtin.set_fact:
     leapp_inhibitors: "{{ results_inhibitors.stdout_lines + results_errors.stdout_lines }}"
 ...

roles/analysis/tasks/main.yml

@@ -7,7 +7,7 @@
     job_name: RIPU preupgrade analysis
 
 - name: Include tasks for preupg assistant analysis
-  ansible.builtin.include_tasks: analysis-preupg.yml
+  ansible.builtin.include_tasks: analysis-preupg-el6.yml
   when: ansible_facts["distribution_major_version"]|int == 6
 
 - name: Include tasks for leapp preupgrade analysis

roles/upgrade/tasks/main.yml

@@ -7,7 +7,7 @@
     job_name: RIPU in-place OS upgrade
 
 - name: Include tasks for upgrade using redhat-upgrade-tool
-  ansible.builtin.include_tasks: redhat-upgrade-tool-upgrade.yml
+  ansible.builtin.include_tasks: redhat-upgrade-tool-upgrade-el6.yml
   when: ansible_facts["distribution_major_version"]|int == 6
 
 - name: Include tasks for leapp upgrade
@@ -18,7 +18,7 @@
   ansible.builtin.include_tasks: upgrade-validation.yml
 
 - name: Include tasks for redhat-upgrade-tool post upgrade
-  ansible.builtin.include_tasks: redhat-upgrade-tool-post-upgrade.yml
+  ansible.builtin.include_tasks: redhat-upgrade-tool-post-upgrade-el6.yml
   when: ansible_facts.ansible_local.pre_ripu.distribution_major_version|int == 6
 
 - name: Include tasks for leapp post upgrade

…sks/redhat-upgrade-tool-post-upgrade.yml …redhat-upgrade-tool-post-upgrade-el6.ymlroles/upgrade/tasks/redhat-upgrade-tool-post-upgrade.yml renamed to roles/upgrade/tasks/redhat-upgrade-tool-post-upgrade-el6.yml roles/upgrade/tasks/redhat-upgrade-tool-post-upgrade.yml renamed to roles/upgrade/tasks/redhat-upgrade-tool-post-upgrade-el6.yml

@@ -1,11 +1,11 @@
 ---
 # TODO: Having issues with community.general.redhat_subscription and subscription-manager on RHEL 6.
-- name: redhat-upgrade-tool-post-upgrade | Ensure redhat-upgrade-cmdline-instrepo.repo file is absent
+- name: redhat-upgrade-tool-post-upgrade-el6 | Ensure redhat-upgrade-cmdline-instrepo.repo file is absent
   ansible.builtin.file:
     path: /etc/yum.repos.d/redhat-upgrade-cmdline-instrepo.repo
     state: absent
 
-- name: redhat-upgrade-tool-post-upgrade | "Register to post upgrade activation key"
+- name: redhat-upgrade-tool-post-upgrade-el6 | "Register to post upgrade activation key"
   ansible.builtin.shell: >
     export PATH={{ leapp_os_path }};
     subscription-manager register
@@ -20,23 +20,23 @@
   failed_when: false
   changed_when: true
 
-- name: redhat-upgrade-tool-post-upgrade | Include custom_local_repos for local_repos_post_upgrade
+- name: redhat-upgrade-tool-post-upgrade-el6 | Include custom_local_repos for local_repos_post_upgrade
   vars:
     __repos: "{{ leapp_local_repos_post_upgrade }}"
   ansible.builtin.include_role:
     name: infra.leapp.common
     tasks_from: custom_local_repos
   when: leapp_upgrade_type == "custom"
 
-- name: redhat-upgrade-tool-post-upgrade | Include handle-old-packages.yml
+- name: redhat-upgrade-tool-post-upgrade-el6 | Include handle-old-packages.yml
   ansible.builtin.include_tasks: handle-old-packages.yml
 
-- name: redhat-upgrade-tool-post-upgrade | Include grub2-upgrade.yml
+- name: redhat-upgrade-tool-post-upgrade-el6 | Include grub2-upgrade.yml
   ansible.builtin.include_tasks: grub2-upgrade.yml
   when:
     - ansible_facts["architecture"] == 'x86_64'
     - leapp_update_grub_to_grub_2
 
-- name: redhat-upgrade-tool-post-upgrade | Include update-and-reboot.yml
+- name: redhat-upgrade-tool-post-upgrade-el6 | Include update-and-reboot.yml
   ansible.builtin.include_tasks: update-and-reboot.yml
 ...

…de/tasks/redhat-upgrade-tool-upgrade.yml …asks/redhat-upgrade-tool-upgrade-el6.ymlroles/upgrade/tasks/redhat-upgrade-tool-upgrade.yml renamed to roles/upgrade/tasks/redhat-upgrade-tool-upgrade-el6.yml roles/upgrade/tasks/redhat-upgrade-tool-upgrade.yml renamed to roles/upgrade/tasks/redhat-upgrade-tool-upgrade-el6.yml

@@ -1,13 +1,13 @@
 ---
-- name: redhat-upgrade-tool-upgrade | Warn about limited ongoing technical support for RHEL 6
+- name: redhat-upgrade-tool-upgrade-el6 | Warn about limited ongoing technical support for RHEL 6
   ansible.builtin.warn:
     msg: >-
       RHEL 6 is in the Extended Life Phase which means that the current upgrade path
       has limited ongoing technical support. To learn more about the RHEL in-place
       upgrade support policy, please refer to the following article:
       https://access.redhat.com/articles/7102732.
 
-- name: redhat-upgrade-tool-upgrade | Run preupg --riskcheck
+- name: redhat-upgrade-tool-upgrade-el6 | Run preupg --riskcheck
   ansible.builtin.shell: >
     export PATH={{ leapp_os_path }};
     preupg --riskcheck
@@ -16,14 +16,14 @@
   failed_when: false
   when: leapp_check_analysis_results
 
-- name: redhat-upgrade-tool-upgrade | Assert that preupg was successful
+- name: redhat-upgrade-tool-upgrade-el6 | Assert that preupg was successful
   ansible.builtin.assert:
     that: not __leapp_preupg_return_codes[preupg.rc].inhibited
     msg: "{{ __leapp_preupg_return_codes[preupg.rc].msg }}"
   when: leapp_check_analysis_results
 
 # TODO: Having issues with community.general.redhat_subscription and subscription-manager on RHEL 6.
-- name: redhat-upgrade-tool-upgrade | Register to leapp activation key
+- name: redhat-upgrade-tool-upgrade-el6 | Register to leapp activation key
   ansible.builtin.shell: >
     set -o pipefail;
     export PATH={{ leapp_os_path }};
@@ -39,25 +39,25 @@
   failed_when: false
   changed_when: true
 
-- name: redhat-upgrade-tool-upgrade | Include custom_local_repos for local_repos_post_upgrade
+- name: redhat-upgrade-tool-upgrade-el6 | Include custom_local_repos for local_repos_post_upgrade
   vars:
     __repos: "{{ leapp_local_repos_pre }}"
   ansible.builtin.include_role:
     name: infra.leapp.common
     tasks_from: custom_local_repos
   when: leapp_upgrade_type == "custom"
 
-- name: redhat-upgrade-tool-upgrade | Gather package facts
+- name: redhat-upgrade-tool-upgrade-el6 | Gather package facts
   ansible.builtin.package_facts:
 
-- name: redhat-upgrade-tool-upgrade | Get package version lock entries
+- name: redhat-upgrade-tool-upgrade-el6 | Get package version lock entries
   ansible.builtin.command: # noqa: command-instead-of-module
     cmd: "{{ ansible_facts['pkg_mgr'] }} versionlock list"
   register: versionlock_list
   changed_when: false
   failed_when: false
 
-- name: redhat-upgrade-tool-upgrade | Remove all package version locks
+- name: redhat-upgrade-tool-upgrade-el6 | Remove all package version locks
   ansible.builtin.command: # noqa: command-instead-of-module
     cmd: "{{ ansible_facts['pkg_mgr'] }} versionlock clear"
   changed_when: true
@@ -67,40 +67,40 @@
 
 # Clean up upgrade repository from failed previous runs.
 # So upgrade-and-reboot.yml can succeed.
-- name: redhat-upgrade-tool-upgrade | Disable redhat-upgrade-cmdline-instrepo.repo
+- name: redhat-upgrade-tool-upgrade-el6 | Disable redhat-upgrade-cmdline-instrepo.repo
   ansible.builtin.include_tasks: disable-previous-repo-files.yml
   loop:
     - redhat-upgrade-cmdline-instrepo.repo
   when: leapp_upgrade_type == "custom"
 
-- name: redhat-upgrade-tool-upgrade | Include update-and-reboot.yml
+- name: redhat-upgrade-tool-upgrade-el6 | Include update-and-reboot.yml
   ansible.builtin.include_tasks: update-and-reboot.yml
 
-- name: redhat-upgrade-tool-upgrade | Get enabled RHEL 6 repositories
+- name: redhat-upgrade-tool-upgrade-el6 | Get enabled RHEL 6 repositories
   ansible.builtin.command: subscription-manager repos --list-enabled
   register: __rhel6_enabled_repos
   changed_when: false
   failed_when: false
 
-- name: redhat-upgrade-tool-upgrade | Disable RHEL 6 repositories
+- name: redhat-upgrade-tool-upgrade-el6 | Disable RHEL 6 repositories
   ansible.builtin.command: subscription-manager repos --disable="*"
   changed_when: true
   when:
     - __rhel6_enabled_repos.rc == 0
     - "'Repo ID' in __rhel6_enabled_repos.stdout"
 
-- name: redhat-upgrade-tool-upgrade | Include disable-previous-repo-files.yml
+- name: redhat-upgrade-tool-upgrade-el6 | Include disable-previous-repo-files.yml
   ansible.builtin.include_tasks: disable-previous-repo-files.yml
   loop: "{{ leapp_repo_files_to_remove_at_upgrade }}"
   when: leapp_upgrade_type == "custom"
 
-- name: redhat-upgrade-tool-upgrade | Install RPM Key for RHEL 7 ISO Repository
+- name: redhat-upgrade-tool-upgrade-el6 | Install RPM Key for RHEL 7 ISO Repository
   ansible.builtin.rpm_key:
     key: "{{ leapp_rhel_7_network_install_repo_url }}/RPM-GPG-KEY-redhat-release"
     state: present
   when: leapp_upgrade_type == "custom"
 
-- name: redhat-upgrade-tool-upgrade | Unload kernel modules before upgrade
+- name: redhat-upgrade-tool-upgrade-el6 | Unload kernel modules before upgrade
   ansible.builtin.include_role:
     name: infra.leapp.common
     tasks_from: manage_kernel_modules.yml
@@ -109,7 +109,7 @@
     leapp_kernel_modules_state: absent
 
 # --cleanup-post removes Red Hat signed RHEL 6 packages and in theory should be safe.
-- name: redhat-upgrade-tool-upgrade | Run redhat-upgrade-tool
+- name: redhat-upgrade-tool-upgrade-el6 | Run redhat-upgrade-tool
   ansible.builtin.shell: >
     set -o pipefail;
     export PATH={{ leapp_os_path }};
@@ -123,7 +123,7 @@
   # failed_when: false
   changed_when: true
 
-- name: redhat-upgrade-tool-upgrade | Reboot to continue OS upgrade
+- name: redhat-upgrade-tool-upgrade-el6 | Reboot to continue OS upgrade
   ansible.builtin.reboot:
     msg: Host is starting OS upgrade now!
     reboot_timeout: "{{ leapp_upgrade_timeout }}"