From 7bed08766acce775e8a3e18a8e22b146ca2793d7 Mon Sep 17 00:00:00 2001
From: Andrey Piskunov <andrey.piskunov@mariadb.com>
Date: Fri, 14 Apr 2023 18:55:57 +0300
Subject: [PATCH] Add dmesg to regressionlog step (#2810)

* Add dmesg to regressionlog step

* dmesg from the outside

* put dmesg one level higher

* Add server logs

* Archive the whole queries dir

* Remove dmesg
---
 .drone.jsonnet     | 2 ++
 core_dumps/logs.sh | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index 5a5416612..aa819e6e6 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -424,12 +424,14 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
       'echo',
       'docker cp regression$${DRONE_BUILD_NUMBER}:/mariadb-columnstore-regression-test/mysql/queries/nightly/alltest/reg-logs/ /drone/src/' + result + '/',
       'docker cp regression$${DRONE_BUILD_NUMBER}:/mariadb-columnstore-regression-test/mysql/queries/nightly/alltest/testErrorLogs.tgz /drone/src/' + result + '/ || echo "missing testErrorLogs.tgz"',
+      'docker exec -t regression$${DRONE_BUILD_NUMBER} bash -c "tar czf regressionQueries.tgz /mariadb-columnstore-regression-test/mysql/queries/"',
       'docker exec -t --workdir /mariadb-columnstore-regression-test/mysql/queries/nightly/alltest regression$${DRONE_BUILD_NUMBER} bash -c "tar czf testErrorLogs2.tgz *.log /var/log/mariadb/columnstore" || echo "failed to grab regression results"',
       'docker cp regression$${DRONE_BUILD_NUMBER}:/mariadb-columnstore-regression-test/mysql/queries/nightly/alltest/testErrorLogs2.tgz /drone/src/' + result + '/ || echo "missing testErrorLogs.tgz"',
       'docker exec -t regression$${DRONE_BUILD_NUMBER} bash -c "/logs.sh regression"',
       'docker exec -t regression$${DRONE_BUILD_NUMBER} bash -c "/core_dump_check.sh core /core/ Regression"',
       'docker cp regression$${DRONE_BUILD_NUMBER}:/unit_logs/ /drone/src/' + result + '/',
       'docker cp regression$${DRONE_BUILD_NUMBER}:/core/ /drone/src/' + result + '/',
+      'docker cp regression$${DRONE_BUILD_NUMBER}:regressionQueries.tgz /drone/src/' + result + '/',
       'ls -l /drone/src/' + result,
       'docker exec -t regression$${DRONE_BUILD_NUMBER} bash -c "/core_dump_drop.sh core"',
       'docker stop regression$${DRONE_BUILD_NUMBER} && docker rm regression$${DRONE_BUILD_NUMBER} || echo "cleanup regression failure"',
diff --git a/core_dumps/logs.sh b/core_dumps/logs.sh
index cea6fa92d..5ebc3469d 100755
--- a/core_dumps/logs.sh
+++ b/core_dumps/logs.sh
@@ -14,6 +14,7 @@ dump_log ()
     journalctl -u "$name".service > "$DIR_NAME"/"${name}_${STEP_NAME}".log
 }
 
+dump_log "mariadb"
 dump_log "mcs-ddlproc"
 dump_log "mcs-dmlproc"
 dump_log "mcs-loadbrm"