Fix 9 to 10 upgrade tests

changelogs/fragments/302-fix-post-upgrade-custom-repos-update.yml

@@ -0,0 +1,4 @@
+---
+minor_changes:
+  - Fix the post-upgrade on-demand update so that it will not execute if there are no post-upgrade repositories specified.
+...

roles/analysis/tests/tests_default.yml

@@ -3,6 +3,21 @@
   hosts: all
   vars:
     job_name: test_analysis
-  roles:
-    - analysis
+  tasks:
+    - name: Test | Run analysis
+      block:
+        - name: Test | Run role analysis
+          ansible.builtin.include_role:
+            name: infra.leapp.analysis
+      always:
+        - name: Cleanup | Remove log files
+          tags: tests::cleanup
+          ansible.builtin.shell:
+            executable: /bin/bash
+            cmd: |
+              set -euxo pipefail
+              rm -f /var/log/leapp/leapp-upgrade.log
+              rm -f /var/log/ripu/ripu.log*
+          changed_when: true
+
 ...

roles/common/tests/tests_default.yml

@@ -3,6 +3,20 @@
   hosts: all
   vars:
     job_name: test_common
-  roles:
-    - common
+  tasks:
+    - name: Test | Run common
+      block:
+        - name: Test | Run role common
+          ansible.builtin.include_role:
+            name: infra.leapp.common
+      always:
+        - name: Cleanup | Remove log files
+          tags: tests::cleanup
+          ansible.builtin.shell:
+            executable: /bin/bash
+            cmd: |
+              set -euxo pipefail
+              rm -f /var/log/leapp/leapp-upgrade.log
+              rm -f /var/log/ripu/ripu.log*
+          changed_when: true
 ...

roles/upgrade/tasks/leapp-post-upgrade.yml

@@ -169,7 +169,9 @@
 
 - name: leapp-post-upgrade | Include update-and-reboot.yml
   ansible.builtin.include_tasks: update-and-reboot.yml
-  when: post_upgrade_update | bool
+  when:
+    - post_upgrade_update | bool
+    - leapp_upgrade_type != "custom" or local_repos_post_upgrade | length > 0
 
 # TODO: Validate RHEL OS versions again?
 

roles/upgrade/tests/tests_default.yml

@@ -23,4 +23,14 @@
             - results_errors.stdout_lines | length > 0
           vars:
             err_pat: This system is not yet registered
+      always:
+        - name: Cleanup | Remove log files
+          tags: tests::cleanup
+          ansible.builtin.shell:
+            executable: /bin/bash
+            cmd: |
+              set -euxo pipefail
+              rm -f /var/log/leapp/leapp-upgrade.log
+              rm -f /var/log/ripu/ripu.log*
+          changed_when: true
 ...