From bb5a21941d8420850cc719a8a37077cdc8f9be0a Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Wed, 10 Jan 2024 17:43:16 +0100
Subject: [PATCH] Update skipped-tests-list for 10.11.6 release

---
 mariadb.spec               |  4 ++--
 rh-skipped-tests-base.list | 18 ++++++++++++++++++
 rh-skipped-tests-ppc.list  |  3 +++
 rh-skipped-tests-s390.list |  8 ++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/mariadb.spec b/mariadb.spec
index 99f43f2..6ba09b3 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -11,7 +11,7 @@
 # The last version on which the full testsuite has been run
 # In case of further rebuilds of that version, don't require full testsuite to be run
 # run only "main" suite
-%global last_tested_version 10.5.22
+%global last_tested_version 10.11.6
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 
@@ -1255,7 +1255,7 @@ export MTR_BUILD_THREAD=$(( $(date +%s) % 1100 ))
       --skip-test-list=unstable-tests
     %endif
     # Second run for the SPIDER suites that fail with SCA (ssl self signed certificate)
-    perl ./mysql-test-run.pl $common_testsuite_arguments --skip-ssl --big-test --suite=spider,spider/bg,spider/bugfix,spider/handler \
+    perl ./mysql-test-run.pl $common_testsuite_arguments --skip-ssl --big-test --suite=spider,spider/bg,spider/bugfix \
     %if %{ignore_testsuite_result}
       --max-test-fail=999 || :
     %else
diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list
index 7af2374..828cab8 100644
--- a/rh-skipped-tests-base.list
+++ b/rh-skipped-tests-base.list
@@ -96,3 +96,21 @@ rpl.rpl_row_img_sequence_min                :
 rpl.rpl_row_img_sequence_noblob             :
 rpl.rpl_xa_empty_transaction                :
 rpl.rpl_slave_shutdown_mdev20821            :
+
+# Fails on 10.11.6
+main.plugin_auth                            :
+
+binlog_encryption.rpl_gtid_basic            :
+multi_source.info_logs                      :
+perfschema.threads_mysql                    :
+rpl.rpl_cant_read_event_incident            :
+rpl.rpl_change_master_demote                :
+rpl.rpl_domain_id_filter_restart            :
+rpl.rpl_gtid_basic                          :
+rpl.rpl_mdev6020                            :
+rpl.rpl_old_master                          :
+rpl.rpl_perfschema_applier_status_by_coordinator :
+rpl.rpl_rewrite_db_sys_vars                 :
+rpl.rpl_semi_sync_wait_point                :
+rpl.rpl_trigger                             :
+rpl.rpl_upgrade_master_info                 :
diff --git a/rh-skipped-tests-ppc.list b/rh-skipped-tests-ppc.list
index 7b982e0..48f7c63 100644
--- a/rh-skipped-tests-ppc.list
+++ b/rh-skipped-tests-ppc.list
@@ -5,3 +5,6 @@ oqgraph.social :
 innodb.innodb_defrag_concurrent        :
 parts.partition_alter4_innodb          :
 rpl.rpl_parallel_optimistic_xa_lsu_off :
+
+# Fails on 10.11.6
+perfschema.threads_innodb :
diff --git a/rh-skipped-tests-s390.list b/rh-skipped-tests-s390.list
index 3ca7588..b898780 100644
--- a/rh-skipped-tests-s390.list
+++ b/rh-skipped-tests-s390.list
@@ -1,3 +1,11 @@
 # Fails since 10.5.2
 perfschema.memory_aggregate_32bit :
 period.overlaps :
+
+# Fails on 10.11.6
+main.func_json_notembedded :
+
+innodb_gis.rtree_rollback1 :
+mariabackup.encrypted_page_corruption :
+mariabackup.huge_lsn :
+mariabackup.xb_file_key_management :