From 9e0c2809468c08557c0119ccb9f1a34ce0a94c53 Mon Sep 17 00:00:00 2001
From: Fabian Koller <github@kthxbye.cyou>
Date: Wed, 20 Aug 2025 10:40:31 +0200
Subject: [PATCH 1/2] ci: enable serial console logging for CHV

also store additional host information for identifying CHV problems
---
 .../test/integration/collect-logs/action.yml     |  7 ++++++-
 .../test/integration/test/cloudhypervisor/vm.xml | 16 +++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/actions/test/integration/collect-logs/action.yml b/.github/actions/test/integration/collect-logs/action.yml
index ccff08f..01771fc 100644
--- a/.github/actions/test/integration/collect-logs/action.yml
+++ b/.github/actions/test/integration/collect-logs/action.yml
@@ -6,9 +6,12 @@ runs:
     - name: Obtain logs from test runner
       shell: bash
       run: |
+        sudo lscpu > lscpu-RUNNER.log || true
+        sudo lshw > lshw-runner.log || true
+        sudo journalctl --no-pager > journal-RUNNER.log || true
+
         sudo cp /var/log/libvirt/qemu/HV1.log "libvirt-HV1.log" || true
         sudo cp /var/log/libvirt/qemu/HV2.log "libvirt-HV2.log" || true
-        sudo journalctl --no-pager > journal-RUNNER.log || true
 
     - name: Obtain logs from hypervisors
       shell: bash
@@ -23,11 +26,13 @@ runs:
         scp $SSH_OPTS $USER@$HV1_IP:/var/log/libvirt/qemu/VM-QEMU.log "libvirt-VM-QEMU-HV1.log" || true
         scp $SSH_OPTS $USER@$HV1_IP:/var/log/libvirt/ch/VM-CHV.log "libvirt-VM-CHV-HV1.log" || true
         scp $SSH_OPTS $USER@$HV1_IP:/var/log/QEMU.log "serial-VM-QEMU-HV1.log" || true
+        scp $SSH_OPTS $USER@$HV1_IP:/var/log/CHV.log "serial-VM-CHV-HV1.log" || true
 
         ssh $SSH_OPTS $USER@$HV2_IP "journalctl --no-pager" > "journal-HV2.log" || true
         scp $SSH_OPTS $USER@$HV2_IP:/var/log/libvirt/qemu/VM-QEMU.log "libvirt-VM-QEMU-HV2.log" || true
         scp $SSH_OPTS $USER@$HV2_IP:/var/log/libvirt/ch/VM-CHV.log "libvirt-VM-CHV-HV2.log" || true
         scp $SSH_OPTS $USER@$HV2_IP:/var/log/QEMU.log "serial-VM-QEMU-HV2.log" || true
+        scp $SSH_OPTS $USER@$HV2_IP:/var/log/CHV.log "serial-VM-CHV-HV2.log" || true
 
     - name: Set permissions
       shell: bash
diff --git a/.github/actions/test/integration/test/cloudhypervisor/vm.xml b/.github/actions/test/integration/test/cloudhypervisor/vm.xml
index 655cd45..96f87b6 100644
--- a/.github/actions/test/integration/test/cloudhypervisor/vm.xml
+++ b/.github/actions/test/integration/test/cloudhypervisor/vm.xml
@@ -23,15 +23,13 @@
             <source network='default' />
             <model type='virtio' />
         </interface>
-        <!-- currently not supported with libvirt/chv: -->
-        <!-- error: internal error: Serial only works in UNIX/PTY modes -->
-        <!-- <console type='pty'> -->
-        <!--     <target type='serial' port='0' /> -->
-        <!-- </console> -->
-        <!-- <serial type='file'> -->
-        <!--     <source path='/var/log/CHV.log' /> -->
-        <!--     <target port='0' /> -->
-        <!-- </serial> -->
+        <console type='pty'>
+            <target type='serial' port='0' />
+        </console>
+        <serial type='file'>
+            <source path='/var/log/CHV.log' />
+            <target port='0' />
+        </serial>
     </devices>
 </domain>
 

From 931f9e405aacc838c5ab88a8e9c49128e4764a3c Mon Sep 17 00:00:00 2001
From: Fabian Koller <github@kthxbye.cyou>
Date: Tue, 26 Aug 2025 11:53:29 +0200
Subject: [PATCH 2/2] ci: drop console from CHV libvirt definition

> internal error: Console only works in PTY mode
---
 .github/actions/test/integration/test/cloudhypervisor/vm.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/actions/test/integration/test/cloudhypervisor/vm.xml b/.github/actions/test/integration/test/cloudhypervisor/vm.xml
index 96f87b6..68108ff 100644
--- a/.github/actions/test/integration/test/cloudhypervisor/vm.xml
+++ b/.github/actions/test/integration/test/cloudhypervisor/vm.xml
@@ -23,9 +23,6 @@
             <source network='default' />
             <model type='virtio' />
         </interface>
-        <console type='pty'>
-            <target type='serial' port='0' />
-        </console>
         <serial type='file'>
             <source path='/var/log/CHV.log' />
             <target port='0' />