The package rpms/community-mysql.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/community-mysql.git/commit/?id=0a...
https://src.fedoraproject.org/cgit/rpms/community-mysql.git/commit/?id=47....
Change:
-%ifarch s390x
-%ifarch ppc64le
Thanks.
Full change:
============
commit ba7e90756766fe641fdd20a11e65aa07c60dcfb3
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Sun May 2 22:05:51 2021 +0200
Allow to run the test-suite in parallel when more versions are built
diff --git a/community-mysql.spec b/community-mysql.spec
index af5b78a..df6c4c7 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -610,8 +610,11 @@ pushd %_vpath_builddir
make test VERBOSE=1
pushd mysql-test
cp ../../mysql-test/%{skiplist} .
-# builds might happen at the same host, avoid collision
-export MTR_BUILD_THREAD=%{__isa_bits}
+
+# Builds might happen at the same host, avoid collision
+# The port used is calculated as 10 * MTR_BUILD_THREAD + 10000
+# The resulting port must be between 5000 and 32767
+export MTR_BUILD_THREAD=$(( $(date +%s) % 2200 ))
./mtr %{?with_debug:--debug-server} \
--parallel=auto --force --retry=2 \
commit 0ab576df543cac58a1d8fcb5472499454a3e9d3b
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Sun May 2 22:03:26 2021 +0200
Move the disabled tests lists to the standalone files per architecture families
It will help the maintainers when trying to keep SPECs for different versions or
product with minimal amount of differences
diff --git a/community-mysql.spec b/community-mysql.spec
index 00d26de..af5b78a 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -97,6 +97,11 @@ Source18: mysql@.service.in
Source30: %{pkgnamepatch}.rpmlintrc
# Configuration for server
Source31: server.cnf.in
+# Skipped tests lists
+Source50: rh-skipped-tests-list-base.list
+Source51: rh-skipped-tests-list-arm.list
+Source52: rh-skipped-tests-list-s390.list
+Source53: rh-skipped-tests-list-ppc.list
# Comments for these patches are in the patch files
# Patches common for more mysql-like packages
@@ -385,92 +390,25 @@ pushd boost/boost_$(echo %{boost_bundled_version}| tr . _)
%patch125 -p1
popd
-# Modify tests to pass on all archs
-pushd mysql-test
-
-add_test () {
- echo "$1" : BUG#0 "${@:2}" >> %{skiplist}
-}
-
-touch %{skiplist}
-# Fails on all arches
-add_test main.subquery_sj_mat_bka_nobnl failing since 8.0.24 on F32+
-add_test main.derived_limit failing since 8.0.24 on F32+
-add_test main.explain_tree failing since 8.0.24 on F32+
-add_test auth_sec.keyring_file_data_qa failing on F32+
-add_test innodb.alter_kill failing on F34+
+# generate a list of tests that fail, but are not disabled by upstream
+cat %{SOURCE50} | tee -a mysql-test/%{skiplist}
-# Fails when -DENABLED_LOCAL_INFILE=ON
-add_test main.mysql_load_data_local_dir failing on F32+
-
-# Unstable
-add_test innodb.innodb_force_recovery unstable since 8.0.24 on F32+
-%ifarch x86_64 i686
-add_test clone.local_dml_auto_tune unstable on x86_64 and i686
-add_test perfschema.threads_mysql unstable on x86_64 and i686
-add-test rpl_gtid.rpl_multi_source_mtr_includes unstable on x86_64 and i686
+# disable some tests failing on different architectures
+%ifarch %{arm} aarch64
+cat %{SOURCE51} | tee -a mysql-test/%{skiplist}
%endif
-# ppc64le
-%ifarch ppc64le
-add_test sys_vars.innodb_buffer_pool_size_basic fails only on ppc64le on f32+
+%ifarch s390 s390x
+cat %{SOURCE52} | tee -a mysql-test/%{skiplist}
%endif
-# armv7hl
-%ifarch armv7hl
-add_test gis.st_latitude fails on F32+
-add_test gis.st_longitude fails on F32+
-
-add_test perfschema.func_file_io missing hw on 32-bit arm
-add_test perfschema.global_read_lock missing hw on 32-bit arm
-add_test perfschema.relaylog missing hw on 32-bit arm
-add_test perfschema.setup_objects missing hw on 32-bit arm
-
-add_test clone.remote_error_basic fails since 8.0.19 on F32+,
max_allowed_packet is 0
-
-add_test clone.remote_dml_auto_tune
-
-# Unstable
-add_test clone.local_dml_auto_tune unstable on armv7hl
-add_test innodb.innodb_bug-13628249 unstable on armv7hl
-add_test main.grant_dynamic_flush unstable on armv7hl
-add_test innodb.innodb_read_only
+%ifarch ppc ppc64 ppc64p7 ppc64le
+cat %{SOURCE53} | tee -a mysql-test/%{skiplist}
%endif
-# s390x
-%ifarch s390x
-# Fails since 8.0.21
-add_test x.resource_groups
-
-# Fails since 8.0.22
-add_test main.subquery_bugs
-
-# Fails since F32 Mass Rebuild
-add_test gis.geometry_class_attri_prop
-add_test gis.geometry_property_function_issimple
-add_test gis.gis_bugs_crashes
-add_test gis.spatial_analysis_functions_buffer
-add_test gis.spatial_analysis_functions_centroid
-add_test gis.spatial_analysis_functions_distance
-add_test gis.spatial_operators_intersection
-add_test gis.spatial_operators_union
-add_test gis.spatial_operators_symdifference
-add_test gis.spatial_op_testingfunc_mix
-add_test gis.spatial_utility_function_distance_sphere
-add_test gis.spatial_utility_function_simplify
-
-add_test main.window_std_var
-add_test main.window_std_var_optimized
-add_test main.with_recursive
-
-# Unstable
-add_test main.grant_dynamic_flush
-%endif
-# mysql-test
-popd
cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
%{SOURCE14} %{SOURCE15} %{SOURCE17} %{SOURCE18} %{SOURCE31} scripts
diff --git a/rh-skipped-tests-list-arm.list b/rh-skipped-tests-list-arm.list
new file mode 100644
index 0000000..4f73b0d
--- /dev/null
+++ b/rh-skipped-tests-list-arm.list
@@ -0,0 +1,19 @@
+gis.st_latitude : BUG#0 fails on F32+
+gis.st_longitude : BUG#0 fails on F32+
+
+perfschema.func_file_io : BUG#0 missing hw on 32-bit arm
+perfschema.global_read_lock : BUG#0 missing hw on 32-bit arm
+perfschema.relaylog : BUG#0 missing hw on 32-bit arm
+perfschema.setup_objects : BUG#0 missing hw on 32-bit arm
+
+clone.remote_error_basic : BUG#0 fails since 8.0.19 on F32+,
max_allowed_packet is 0
+
+clone.remote_dml_auto_tune : BUG#0
+
+# Unstable
+clone.local_dml_auto_tune : BUG#0
+innodb.innodb_bug-13628249 : BUG#0
+main.grant_dynamic_flush : BUG#0
+innodb.innodb_read_only : BUG#0
+
+rpl_nogtid.rpl_mixed_mixing_engines : BUG#0 timeout after 1800 secs or armv7hl
diff --git a/rh-skipped-tests-list-base.list b/rh-skipped-tests-list-base.list
new file mode 100644
index 0000000..5b377c7
--- /dev/null
+++ b/rh-skipped-tests-list-base.list
@@ -0,0 +1,17 @@
+# Fails on all arches
+main.subquery_sj_mat_bka_nobnl : BUG#0 failing since 8.0.24 on F32+
+main.derived_limit : BUG#0 failing since 8.0.24 on F32+
+main.explain_tree : BUG#0 failing since 8.0.24 on F32+
+
+auth_sec.keyring_file_data_qa : BUG#0 failing on F32+
+innodb.alter_kill : BUG#0 failing on F34+
+
+# Fails when -DENABLED_LOCAL_INFILE=ON
+main.mysql_load_data_local_dir : BUG#0 failing on F32+
+
+# Unstable
+innodb.innodb_force_recovery : BUG#0 unstable since 8.0.24 on F32+
+clone.local_dml_auto_tune : BUG#0 unstable on x86_64 and i686
+perfschema.threads_mysql : BUG#0 unstable on x86_64 and i686
+rpl_gtid.rpl_multi_source_mtr_includes : BUG#0 unstable on x86_64 and i686
+
diff --git a/rh-skipped-tests-list-ppc.list b/rh-skipped-tests-list-ppc.list
new file mode 100644
index 0000000..d4da526
--- /dev/null
+++ b/rh-skipped-tests-list-ppc.list
@@ -0,0 +1,3 @@
+# ppc64le
+sys_vars.innodb_buffer_pool_size_basic : BUG#0 fails only on ppc64le on f32+
+
diff --git a/rh-skipped-tests-list-s390.list b/rh-skipped-tests-list-s390.list
new file mode 100644
index 0000000..a936ed9
--- /dev/null
+++ b/rh-skipped-tests-list-s390.list
@@ -0,0 +1,27 @@
+# Fails since 8.0.21
+x.resource_groups : BUG#0
+
+# Fails since 8.0.22
+main.subquery_bugs : BUG#0
+
+# Fails since F32 Mass Rebuild
+gis.geometry_class_attri_prop : BUG#0
+gis.geometry_property_function_issimple : BUG#0
+gis.gis_bugs_crashes : BUG#0
+gis.spatial_analysis_functions_buffer : BUG#0
+gis.spatial_analysis_functions_centroid : BUG#0
+gis.spatial_analysis_functions_distance : BUG#0
+gis.spatial_operators_intersection : BUG#0
+gis.spatial_operators_union : BUG#0
+gis.spatial_operators_symdifference : BUG#0
+gis.spatial_op_testingfunc_mix : BUG#0
+gis.spatial_utility_function_distance_sphere : BUG#0
+gis.spatial_utility_function_simplify : BUG#0
+
+main.window_std_var : BUG#0
+main.window_std_var_optimized : BUG#0
+main.with_recursive : BUG#0
+
+# Unstable
+main.grant_dynamic_flush : BUG#0
+
commit 475acdedacfa25651dbfa90e1df8c82d39724858
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Sun May 2 13:36:46 2021 +0200
Update disabled tests list fo the latest release for F32..Rawhide
Disable "--mem" option, because the s390x builders ran out of resources
diff --git a/community-mysql.spec b/community-mysql.spec
index cf51fb6..00d26de 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -394,33 +394,59 @@ add_test () {
touch %{skiplist}
-add_test innodb.redo_log_archive_04 failed since 8.0.17
-add_test clone.remote_dml_no_binlog failed since 8.0.17
-add_test auth_sec.keyring_file_data_qa sporadic since 8.0.19
-add_test collations.chinese sporadic since 8.0.19
+# Fails on all arches
+add_test main.subquery_sj_mat_bka_nobnl failing since 8.0.24 on F32+
+add_test main.derived_limit failing since 8.0.24 on F32+
+add_test main.explain_tree failing since 8.0.24 on F32+
+
+add_test auth_sec.keyring_file_data_qa failing on F32+
+add_test innodb.alter_kill failing on F34+
# Fails when -DENABLED_LOCAL_INFILE=ON
-add_test main.mysql_load_data_local_dir local infile on
-
-add_test rpl.rpl_row_jsondiff_basic_pk failed since 8.0.22
-add_test rpl.rpl_row_jsondiff_basic_nokey failed since 8.0.22
-
-# These tests fail on armv7hl; last check 8.0.16
-%ifarch %arm aarch64
-add_test gis.st_latitude
-add_test gis.st_longitude
-# Missing hw counters
-add_test perfschema.func_file_io missing hw on arm32
-add_test perfschema.func_mutex missing hw on arm32
-add_test perfschema.global_read_lock missing hw on arm32
-add_test perfschema.setup_objects missing hw on arm32
-# Test added in 8.0.19
-add_test clone.remote_error_basic max_allowed_packet is 0
-# Failing in ~90% of times
-add_test innodb.create_tablespace
+add_test main.mysql_load_data_local_dir failing on F32+
+
+# Unstable
+add_test innodb.innodb_force_recovery unstable since 8.0.24 on F32+
+%ifarch x86_64 i686
+add_test clone.local_dml_auto_tune unstable on x86_64 and i686
+add_test perfschema.threads_mysql unstable on x86_64 and i686
+add-test rpl_gtid.rpl_multi_source_mtr_includes unstable on x86_64 and i686
+%endif
+
+# ppc64le
+%ifarch ppc64le
+add_test sys_vars.innodb_buffer_pool_size_basic fails only on ppc64le on f32+
+%endif
+
+# armv7hl
+%ifarch armv7hl
+add_test gis.st_latitude fails on F32+
+add_test gis.st_longitude fails on F32+
+
+add_test perfschema.func_file_io missing hw on 32-bit arm
+add_test perfschema.global_read_lock missing hw on 32-bit arm
+add_test perfschema.relaylog missing hw on 32-bit arm
+add_test perfschema.setup_objects missing hw on 32-bit arm
+
+add_test clone.remote_error_basic fails since 8.0.19 on F32+,
max_allowed_packet is 0
+
+add_test clone.remote_dml_auto_tune
+
+# Unstable
+add_test clone.local_dml_auto_tune unstable on armv7hl
+add_test innodb.innodb_bug-13628249 unstable on armv7hl
+add_test main.grant_dynamic_flush unstable on armv7hl
+add_test innodb.innodb_read_only
%endif
+# s390x
%ifarch s390x
+# Fails since 8.0.21
+add_test x.resource_groups
+
+# Fails since 8.0.22
+add_test main.subquery_bugs
+
# Fails since F32 Mass Rebuild
add_test gis.geometry_class_attri_prop
add_test gis.geometry_property_function_issimple
@@ -429,43 +455,18 @@ add_test gis.spatial_analysis_functions_buffer
add_test gis.spatial_analysis_functions_centroid
add_test gis.spatial_analysis_functions_distance
add_test gis.spatial_operators_intersection
+add_test gis.spatial_operators_union
+add_test gis.spatial_operators_symdifference
add_test gis.spatial_op_testingfunc_mix
add_test gis.spatial_utility_function_distance_sphere
add_test gis.spatial_utility_function_simplify
-add_test innodb.log_encrypt_kill main.with_recursive
-add_test innodb.mysqldump_max_recordsize
-add_test main.lock_multi_bug38499
+
add_test main.window_std_var
add_test main.window_std_var_optimized
add_test main.with_recursive
-# Fails since 8.0.21
-add_test x.resource_groups
-add_test gis.spatial_operators_symdifference
-add_test gis.spatial_operators_union
-
-# Fails since 8.0.22
-add_test main.subquery_bugs
-
-%endif
-
-%ifarch %arm
-# Fails since 8.0.22
-add_test perfschema.relaylog
-
-%endif
-
-# Fails since 2021 new year
-add_test main.cast
-add_test innodb.alter_kill
-# Unstable tests
-add_test innodb.innodb_read_only
-add_test perfschema.processlist_acl
-add_test innodb.innodb_bug-13628249
-
-
-%ifarch ppc64le
-add_test sys_vars.innodb_buffer_pool_size_basic
+# Unstable
+add_test main.grant_dynamic_flush
%endif
# mysql-test
@@ -675,12 +676,12 @@ cp ../../mysql-test/%{skiplist} .
export MTR_BUILD_THREAD=%{__isa_bits}
./mtr %{?with_debug:--debug-server} \
- --mem --parallel=auto --force --retry=2 \
+ --parallel=auto --force --retry=2 \
--mysqld=--binlog-format=mixed \
--suite-timeout=720 --testcase-timeout=30 \
--report-unstable-tests --clean-vardir \
%if %{check_testsuite}
- --max-test-fail=0 || :
+ --max-test-fail=200 || :
%else
--skip-test-list=%{skiplist}
%endif