tests/upgrade: gather more logs

Also disable firwalld AllowZoneDrifting because it's not supported in
RHEL-9.

.gitlab-ci.yml

@@ -407,6 +407,8 @@ Upgrade:
       - ci-artifacts
       - install_console.log
       - upgrade_console.log
+      - leapp-preupgrade.log
+      - leapp-report.txt
       - osbuild-upgrade8to9.log
       - osbuild-upgrade8to9.json
     when: always

test/cases/upgrade8to9.sh

@@ -121,6 +121,8 @@ sudo pkill -P "$CONSOLE_PID"
 sudo scp "${SSH_OPTIONS[@]}" -q -i "${SSH_KEY}" /usr/share/tests/osbuild-composer/upgrade8to9/*.sh root@"$INSTANCE_ADDRESS":
 set +e
 sudo ssh "${SSH_OPTIONS[@]}" -q -i "${SSH_KEY}" root@"$INSTANCE_ADDRESS" 'source /root/upgrade_prepare.sh'
+sudo scp "${SSH_OPTIONS[@]}" -q -i "${SSH_KEY}" root@"$INSTANCE_ADDRESS":/var/log/leapp/leapp-preupgrade.log .
+sudo scp "${SSH_OPTIONS[@]}" -q -i "${SSH_KEY}" root@"$INSTANCE_ADDRESS":/var/log/leapp/leapp-report.txt .
 set -e
 
 # watch and log the console during upgrade

test/data/upgrade8to9/upgrade_prepare.sh

@@ -32,6 +32,9 @@ enabled=0
 gpgcheck=0
 EOF
 
+# AllowZoneDrifting is disabled in RHEL-9, see rhbz#2054271 for more details
+sed -i "s/^AllowZoneDrifting=.*/AllowZoneDrifting=no/" /etc/firewalld/firewalld.conf
+
 # check upgrade
 leapp preupgrade --debug --no-rhsm