From e5343a871c60118c1ce66934af3af722cbf838ab Mon Sep 17 00:00:00 2001
From: Jordi Massaguer Pla <jmassaguerpla@suse.com>
Date: Thu, 28 Sep 2023 15:33:28 +0200
Subject: [PATCH 1/2] CI: get server logs in case of failures

Signed-off-by: Jordi Massaguer Pla <jmassaguerpla@suse.com>
---
 .github/workflows/acceptance_tests_common.yml   | 12 ++++++++++++
 .../workflows/acceptance_tests_secondary.yml    |  1 +
 .../acceptance_tests_secondary_parallel.yml     |  1 +
 testsuite/podman_runner/19_get_server_logs.sh   | 17 +++++++++++++++++
 4 files changed, 31 insertions(+)
 create mode 100755 testsuite/podman_runner/19_get_server_logs.sh

diff --git a/.github/workflows/acceptance_tests_common.yml b/.github/workflows/acceptance_tests_common.yml
index b39d14ed7a50..2656abcaf793 100644
--- a/.github/workflows/acceptance_tests_common.yml
+++ b/.github/workflows/acceptance_tests_common.yml
@@ -5,6 +5,9 @@ on:
       secondary_tests:
         required: true
         type: string
+      server_id:
+        required: true
+        type: string
 env:
   UYUNI_PROJECT: uyuni-project
   UYUNI_VERSION: master
@@ -84,4 +87,13 @@ jobs:
         run: ./testsuite/podman_runner/18_split_secondary_p_tests.sh
       - name: run_secondary_tests
         run: ./testsuite/podman_runner/${{ inputs.secondary_tests }} 
+      - name: get_server_logs
+        if: ${{ failure() }}
+        run: ./testsuite/podman_runner/19_get_server_logs.sh ${{ inputs.server_id }}
+      - name: upload_server_log_artifacts
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: server_rhn_logs_${{ inputs.server_id }}
+          path: /tmp/test-all-in-one/server-logs/${{ inputs.server_id }}
 
diff --git a/.github/workflows/acceptance_tests_secondary.yml b/.github/workflows/acceptance_tests_secondary.yml
index ad14472f39f2..e8b8f00dae6f 100644
--- a/.github/workflows/acceptance_tests_secondary.yml
+++ b/.github/workflows/acceptance_tests_secondary.yml
@@ -15,4 +15,5 @@ jobs:
     uses: ./.github/workflows/acceptance_tests_common.yml
     with:
       secondary_tests: "17_run_secondary_tests.sh" 
+      server_id: "secondary"
 
diff --git a/.github/workflows/acceptance_tests_secondary_parallel.yml b/.github/workflows/acceptance_tests_secondary_parallel.yml
index ab94718a3de9..fa72b4f4c760 100644
--- a/.github/workflows/acceptance_tests_secondary_parallel.yml
+++ b/.github/workflows/acceptance_tests_secondary_parallel.yml
@@ -19,3 +19,4 @@ jobs:
         set: ['1', '2', '3', '4', '5']
     with:
       secondary_tests: "18_run_secondary_parallelizable_tests_subset.sh ${{ matrix.set }}"
+      server_id: "secondary_parallel_${{ matrix.set }}"
diff --git a/testsuite/podman_runner/19_get_server_logs.sh b/testsuite/podman_runner/19_get_server_logs.sh
new file mode 100755
index 000000000000..6cfe283b7f7e
--- /dev/null
+++ b/testsuite/podman_runner/19_get_server_logs.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -xe
+
+if [ $# -ne 1 ];
+then
+	echo "Usage: ${0} server_id"
+	echo "server_id is used for creating a unique folder"
+	exit -1
+fi
+
+src_dir=$(cd $(dirname "$0")/../.. && pwd -P)
+server_id=${1}
+rm -rfv /tmp/test-all-in-one/server-logs/${server_id}
+mkdir -p /tmp/test-all-in-one/server-logs/${server_id}
+sudo -i podman exec uyuni-server-all-in-one-test bash -c "tar jcvf /tmp/server-logs/${server_id}/var.log.rhn.tar.bz2 /var/log/rhn/"
+sudo -i podman exec uyuni-server-all-in-one-test bash -c "supportconfig -R /tmp/server-logs/${server_id} && chmod 644 /tmp/server-logs/${server_id}/scc_uyuni-server-all-in-one-test*.txz*"
+

From 2160b60f987ed4de7253e71a91d8f2605bc75254 Mon Sep 17 00:00:00 2001
From: Jordi Massaguer Pla <jmassaguerpla@suse.com>
Date: Fri, 29 Sep 2023 10:29:27 +0200
Subject: [PATCH 2/2] CI: we do not need the server logs

they are already part of the support config logs.

Signed-off-by: Jordi Massaguer Pla <jmassaguerpla@suse.com>
---
 testsuite/podman_runner/19_get_server_logs.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/testsuite/podman_runner/19_get_server_logs.sh b/testsuite/podman_runner/19_get_server_logs.sh
index 6cfe283b7f7e..bf21c9cbafd5 100755
--- a/testsuite/podman_runner/19_get_server_logs.sh
+++ b/testsuite/podman_runner/19_get_server_logs.sh
@@ -12,6 +12,5 @@ src_dir=$(cd $(dirname "$0")/../.. && pwd -P)
 server_id=${1}
 rm -rfv /tmp/test-all-in-one/server-logs/${server_id}
 mkdir -p /tmp/test-all-in-one/server-logs/${server_id}
-sudo -i podman exec uyuni-server-all-in-one-test bash -c "tar jcvf /tmp/server-logs/${server_id}/var.log.rhn.tar.bz2 /var/log/rhn/"
 sudo -i podman exec uyuni-server-all-in-one-test bash -c "supportconfig -R /tmp/server-logs/${server_id} && chmod 644 /tmp/server-logs/${server_id}/scc_uyuni-server-all-in-one-test*.txz*"