SPECfile cleanup
Update of skipped tests list
This commit is contained in:
Michal Schorm
parent
64898829e9
commit
6b973cd88b
@ -43,7 +43,7 @@
|
||||
%bcond_with debug
|
||||
|
||||
# Include files for SysV init or systemd
|
||||
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||
%bcond_without init_systemd
|
||||
%bcond_with init_sysv
|
||||
%global daemondir %{_unitdir}
|
||||
@ -144,11 +144,11 @@ BuildRequires: bison
|
||||
BuildRequires: numactl-devel
|
||||
%endif
|
||||
BuildRequires: openssl-devel
|
||||
%if 0%{?fedora} > 24 || 0%{?rhel} > 7
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: perl-generators
|
||||
%endif
|
||||
%if 0%{?fedora} > 27 || 0%{?rhel} > 7
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
BuildRequires: rpcgen
|
||||
BuildRequires: libtirpc-devel
|
||||
%endif
|
||||
@ -198,7 +198,7 @@ Provides: mysql-compat-client%{?_isa} = %{sameevr}
|
||||
Obsoletes: mysql-cluster < 5.1.44
|
||||
|
||||
# Filtering: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering
|
||||
%if 0%{?fedora} > 14 || 0%{?rhel} > 6
|
||||
%if 0%{?fedora} || 0%{?rhel} > 6
|
||||
%global __requires_exclude ^perl\\((hostnames|lib::mtr|lib::v1|mtr_|My::)
|
||||
%global __provides_exclude_from ^(%{_datadir}/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so)$
|
||||
%else
|
||||
@ -307,8 +307,6 @@ Obsoletes: mysql-bench < 5.7.8
|
||||
Obsoletes: community-mysql-bench < 5.7.8
|
||||
%{?with_conflicts:Conflicts: mariadb-server}
|
||||
%{?with_conflicts:Conflicts: mariadb-galera-server}
|
||||
# A dependency mistake was made, to fix it, old version of the utils must be Obsoleted. Affected versions: F24, F25, F26 until their EOL.
|
||||
Obsoletes: mariadb-server-utils < 3:10.1.21-3
|
||||
|
||||
%description server
|
||||
MySQL is a multi-user, multi-threaded SQL database server. MySQL is a
|
||||
@ -396,11 +394,10 @@ add_test () {
|
||||
|
||||
touch %{skiplist}
|
||||
|
||||
# Fails everywhere
|
||||
# Fails everywhere; last check: 8.0.14
|
||||
add_test auth_sec.cert_verify :
|
||||
add_test auth_sec.mysql_ssl_connection :
|
||||
add_test auth_sec.openssl_cert_generation :
|
||||
add_test auth_sec.openssl_without_fips :
|
||||
add_test auth_sec.ssl_auto_detect :
|
||||
add_test auth_sec.ssl_mode :
|
||||
add_test auth_sec.tls :
|
||||
@ -408,11 +405,10 @@ add_test binlog.binlog_grant_alter_user :
|
||||
add_test innodb.create_tablespace :
|
||||
add_test main.grant_alter_user_qa :
|
||||
add_test main.grant_user_lock_qa :
|
||||
add_test main.mysqldump :
|
||||
add_test main.mysql_ssl_default :
|
||||
add_test main.openssl_1 :
|
||||
add_test main.persisted_variables_bugs :
|
||||
add_test main.plugin_auth_sha256_tls :
|
||||
add_test main.read_only_persisted_plugin_variables :
|
||||
add_test main.ssl :
|
||||
add_test main.ssl_ca :
|
||||
add_test main.ssl_cipher :
|
||||
@ -420,39 +416,28 @@ add_test main.ssl_compress :
|
||||
add_test main.ssl_crl :
|
||||
add_test main.ssl_verify_identity :
|
||||
add_test main.ssl_8k_key :
|
||||
add_test main.type_float :
|
||||
add_test perfschema.start_server_zero_digest_sql_length :
|
||||
add_test x.connection_openssl :
|
||||
add_test x.connection_openssl_unixsocket :
|
||||
add_test x.connection_tls_version :
|
||||
add_test x.mysqlxtest_mode_ssl :
|
||||
add_test x.mysqlxtest_mode_ssl_unixsocket :
|
||||
# Fails from 1.1. 2019
|
||||
add_test auth_sec.openssl_cert_validity :
|
||||
#
|
||||
add_test main.mysqldump :
|
||||
|
||||
# these tests fail on arm
|
||||
%ifarch %arm aarch64
|
||||
add_test innodb.log_corruption :
|
||||
add_test innodb.innodb-wl6445-2 :
|
||||
add_test gis.st_latitude :
|
||||
add_test gis.st_longitude :
|
||||
add_test main.log_options_cmdline:
|
||||
# Missing hw counters; in 5.7.21 reported as unstable tests
|
||||
add_test perfschema.func_file_io : missing hw on arm32
|
||||
add_test perfschema.setup_objects : missing hw on arm32
|
||||
add_test perfschema.global_read_lock : missing hw on arm32
|
||||
add_test perfschema.func_mutex : missing hw on arm32
|
||||
%endif
|
||||
|
||||
# This test fail on ppc64 and ppc64le; applicable in 5.7.21
|
||||
%ifarch ppc64le
|
||||
add_test innodb.create_tablespace :
|
||||
# These tests fail on ppc64 and ppc64le; last check 8.0.14
|
||||
%ifarch ppc ppc64 ppc64le
|
||||
add_test innodb.instant_add_column_basic :
|
||||
add_test innodb.temporary_table_optimization :
|
||||
add_test json.json_functions_innodb :
|
||||
add_test main.ctype_utf8 :
|
||||
add_test main.ctype_utf8mb4_heap :
|
||||
add_test main.ctype_utf8mb4_innodb :
|
||||
add_test main.ctype_utf8mb4_myisam :
|
||||
add_test main.histograms :
|
||||
add_test main.opt_costmodel :
|
||||
add_test main.ps :
|
||||
add_test main.regular_expressions_func :
|
||||
add_test main.regular_expressions_utf-8 :
|
||||
add_test main.select_all :
|
||||
add_test main.select_all_bka :
|
||||
add_test main.select_all_bka_nixbnl :
|
||||
@ -463,10 +448,25 @@ add_test main.select_none :
|
||||
add_test main.select_none_bka :
|
||||
add_test main.select_none_bka_nixbnl :
|
||||
add_test main.sp :
|
||||
add_test main.type_float :
|
||||
add_test main.type_newdecimal :
|
||||
add_test main.type_ranges :
|
||||
add_test test_service_sql_api.test_sql_all_col_types :
|
||||
add_test x.multiple_resultsets :
|
||||
%endif
|
||||
|
||||
# These tests fail on armv7hl; last check 8.0.14
|
||||
%ifarch %arm aarch64
|
||||
add_test gis.st_latitude :
|
||||
add_test gis.st_longitude :
|
||||
add_test x.connection_auth_mechanism_memory_ssl :
|
||||
add_test x.connection_auth_mechanism_memory_with_invalidation :
|
||||
add_test x.connection_auth_mechanism_memory1 :
|
||||
add_test x.connection_auth_mechanism_memory2 :
|
||||
# Missing hw counters; in 5.7.21 reported as unstable tests
|
||||
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
|
||||
%endif
|
||||
|
||||
popd
|
||||
@ -689,13 +689,14 @@ pushd mysql-test
|
||||
cp ../../mysql-test/%{skiplist} .
|
||||
# builds might happen at the same host, avoid collision
|
||||
export MTR_BUILD_THREAD=%{__isa_bits}
|
||||
|
||||
./mtr %{?with_debug:--debug-server} \
|
||||
--mem --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=100 || :
|
||||
--max-test-fail=0 || :
|
||||
%else
|
||||
--skip-test-list=%{skiplist}
|
||||
%endif
|
||||
@ -710,11 +711,6 @@ popd
|
||||
/usr/sbin/useradd -M -N -g mysql -o -r -d %{mysqluserhome} -s /sbin/nologin \
|
||||
-c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || :
|
||||
|
||||
%if %{with clibrary}
|
||||
# Can be dropped on F27 EOL
|
||||
%ldconfig_post libs
|
||||
%endif
|
||||
|
||||
%post server
|
||||
%if %{with init_systemd}
|
||||
%systemd_post %{daemon_name}.service
|
||||
@ -727,9 +723,6 @@ fi
|
||||
if [ ! -e "%{logfile}" -a ! -h "%{logfile}" ] ; then
|
||||
install /dev/null -m0640 -omysql -gmysql "%{logfile}"
|
||||
fi
|
||||
# TODO: remove after selinux-policy is fixed (BZ#1602153)
|
||||
semanage fcontext -a -t mysqld_log_t '/var/log/mysql(/.*)?'
|
||||
restorecon -r %{logfiledir}
|
||||
|
||||
# Enable the SYS_NICE capablilities; #1540946
|
||||
if [ -e "/usr/sbin/setcap" ] ; then
|
||||
@ -747,11 +740,6 @@ if [ $1 = 0 ]; then
|
||||
fi
|
||||
%endif
|
||||
|
||||
%if %{with clibrary}
|
||||
# Can be dropped on F27 EOL
|
||||
%ldconfig_postun libs
|
||||
%endif
|
||||
|
||||
%postun server
|
||||
%if %{with init_systemd}
|
||||
%systemd_postun_with_restart %{daemon_name}.service
|
||||
@ -947,6 +935,14 @@ fi
|
||||
%changelog
|
||||
* Mon Jan 21 2019 Lars Tangvald <lars.tangvald@oracle.com> - 8.0.14-1
|
||||
- Update to MySQL 8.0.14
|
||||
- Remove fedora version condition that are no longer relevant
|
||||
- Update skipped tests list
|
||||
- CVEs fixed: #1666778
|
||||
CVE-2019-2420 CVE-2019-2434 CVE-2019-2436 CVE-2019-2455 CVE-2019-2481
|
||||
CVE-2019-2482 CVE-2019-2486 CVE-2019-2494 CVE-2019-2495 CVE-2019-2502
|
||||
CVE-2019-2503 CVE-2019-2507 CVE-2019-2510 CVE-2019-2528 CVE-2019-2529
|
||||
CVE-2019-2530 CVE-2019-2531 CVE-2019-2532 CVE-2019-2533 CVE-2019-2534
|
||||
CVE-2019-2535 CVE-2019-2536 CVE-2019-2537 CVE-2019-2539
|
||||
|
||||
* Wed Jan 16 2019 Michal Schorm <mschorm@redhat.com> - 8.0.13-3
|
||||
- Tweak handling of the mysql-selinux requirement
|
||||
|
||||
Loading…
Reference in New Issue
Block a user