From 8f35ef3af23793453fddf79b2b3e34ed5b3895b6 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Thu, 29 Mar 2018 03:26:57 +0200 Subject: [PATCH] Rebase to 10.2.14 Update testsuite run for SSL self signed certificates --- mariadb.spec | 19 +++++++++++++++++-- rh-skipped-tests-base.list | 19 ++++++++----------- sources | 2 +- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index 1b3f6b6..eb37e9d 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -118,11 +118,11 @@ # Make long macros shorter %global sameevr %{epoch}:%{version}-%{release} %global compatver 10.2 -%global bugfixver 13 +%global bugfixver 14 Name: mariadb Version: %{compatver}.%{bugfixver} -Release: 2%{?with_debug:.debug}%{?dist} +Release: 1%{?with_debug:.debug}%{?dist} Epoch: 3 Summary: A community developed branch of MySQL @@ -1111,11 +1111,22 @@ export MTR_BUILD_THREAD=%{__isa_bits} --suite-timeout=720 --testcase-timeout=30 \ --mysqld=--binlog-format=mixed --force-restart \ --shutdown-timeout=60 --max-test-fail=0 --big-test \ + --skip-test=spider \ %if %{ignore_testsuite_result} || : %else --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 --force --retry=0 \ + --suite-timeout=720 --testcase-timeout=30 \ + --mysqld=--binlog-format=mixed --force-restart \ + --shutdown-timeout=60 --max-test-fail=0 --big-test \ + --skip-ssl --suite=spider,spider/bg \ +%if %{ignore_testsuite_result} + || : +%endif ) %endif # if dry run @@ -1526,6 +1537,10 @@ fi %endif %changelog +* Thu Mar 29 2018 Michal Schorm - 3:10.2.14-1 +- Rebase to 10.2.14 +- Update testsuite run for SSL self signed certificates + * Tue Mar 6 2018 Michal Schorm - 3:10.2.13-2 - Further fix of ldconfig scriptlets for F27 - Fix hardcoded paths, move unversioned libraries and symlinks to the devel subpackage diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list index 5859a1d..c8c6912 100644 --- a/rh-skipped-tests-base.list +++ b/rh-skipped-tests-base.list @@ -13,9 +13,7 @@ plugins.feedback_plugin_load : # plugins.show_all_plugins : warnings in log # ------------------------------ -# Failing from rebase to 10.1.24 -# issues trackers will be added - +# Tests that fails because of 'Self Signed Certificate in the Certificate Chain' perfschema.cnf_option : rpl.rpl_row_img_blobs : @@ -24,13 +22,6 @@ rpl.rpl_row_img_eng_noblob : sys_vars.slave_parallel_threads_basic : -# Fails since 10.1.12 -innodb.innodb_defrag_binlog : - -# Fails on PPC, PPC64 and AArch -parts.partition_alter4_innodb : #1399847 - -# https://jira.mariadb.org/browse/MDEV-14003 spider/bg.spider3_fixes_part : spider/bg.spider_fixes : spider/bg.spider_fixes_part : @@ -57,6 +48,13 @@ spider.ha : spider.ha_part : spider.vp_fixes : +# ------------------------------ +# Fails since 10.1.12 +innodb.innodb_defrag_binlog : + +# Fails on PPC, PPC64 and AArch +parts.partition_alter4_innodb : #1399847 + # 10.2.12 and 10.2.13 after some unidentified change in Rawhide buildroot mroonga/storage.index_multiple_column_range_all_used_less_than : mroonga/storage.index_multiple_column_range_all_used_less_than_or_equal : @@ -66,4 +64,3 @@ mroonga/storage.index_multiple_column_range_partially_used_no_prefix_less_than mroonga/storage.index_multiple_column_range_partially_used_no_prefix_less_than_or_equal : mroonga/storage.optimization_order_limit_optimized_datetime_less_than : mroonga/storage.optimization_order_limit_optimized_datetime_less_than_or_equal : - diff --git a/sources b/sources index 0de4b83..16ec467 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mariadb-10.2.13.tar.gz) = 4c6038f134a32f50daa3172b367588240ef20a6f6cfe36d830e427cf52d315284481f5300d3db32d9e81ddd352dbea01fd4230f4e4d79e175d97c0c49331a4ca +SHA512 (mariadb-10.2.14.tar.gz) = 12195cc8c7a97619024d6b8b37558a43f4f543efff257a7a3dbb10e8a6e064ec2f0740554cf50cc83576b74ba355cf00f3c99855bc2bcf68b90c1fa90c850026