From df9905f8d563e9bf1fe0aad64267dbef97ba85ac Mon Sep 17 00:00:00 2001 From: Vaclav Danek Date: Tue, 16 Sep 2025 22:39:51 +0200 Subject: [PATCH 1/4] updated gating --- ci.fmf | 2 ++ gating.yaml | 2 +- plans.fmf | 5 +++++ plans/tier1-internal.fmf | 10 ---------- 4 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 ci.fmf create mode 100644 plans.fmf delete mode 100644 plans/tier1-internal.fmf diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..da04079 --- /dev/null +++ b/ci.fmf @@ -0,0 +1,2 @@ +resultsdb-testcase: separate + diff --git a/gating.yaml b/gating.yaml index 4ca9235..c83a55a 100644 --- a/gating.yaml +++ b/gating.yaml @@ -3,4 +3,4 @@ product_versions: - rhel-10 decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/gating-rhel.functional} diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..cd5ff20 --- /dev/null +++ b/plans.fmf @@ -0,0 +1,5 @@ +/gating-rhel: + plan: + import: + url: https://pkgs.devel.redhat.com/git/tests/mysql + name: /plans/versioned/mysql8.4 diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf deleted file mode 100644 index 33ad904..0000000 --- a/plans/tier1-internal.fmf +++ /dev/null @@ -1,10 +0,0 @@ -summary: Internal Tier1 tests plan -discover: - how: fmf - filter: 'tier: 1' - url: https://pkgs.devel.redhat.com/git/tests/mysql -execute: - how: tmt -adjust: - enabled: false - when: distro == centos-stream or distro == fedora From efe7783b297121b7e8608c56da8782f15ac56d90 Mon Sep 17 00:00:00 2001 From: Vaclav Danek Date: Wed, 17 Sep 2025 08:09:45 +0200 Subject: [PATCH 2/4] fixed plan path --- plans.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans.fmf b/plans.fmf index cd5ff20..f0ca0ff 100644 --- a/plans.fmf +++ b/plans.fmf @@ -2,4 +2,4 @@ plan: import: url: https://pkgs.devel.redhat.com/git/tests/mysql - name: /plans/versioned/mysql8.4 + name: /plans/versioned/mysql84 From 93df896049307e8c7c15263f817d43d65d775e07 Mon Sep 17 00:00:00 2001 From: Vaclav Danek Date: Wed, 17 Sep 2025 08:33:22 +0200 Subject: [PATCH 3/4] updated plans to handle multiple plans --- gating.yaml | 2 +- plans.fmf | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gating.yaml b/gating.yaml index c83a55a..0bd4969 100644 --- a/gating.yaml +++ b/gating.yaml @@ -3,4 +3,4 @@ product_versions: - rhel-10 decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/gating-rhel.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/rhel-gating.functional} diff --git a/plans.fmf b/plans.fmf index f0ca0ff..f6b8b17 100644 --- a/plans.fmf +++ b/plans.fmf @@ -1,5 +1,10 @@ -/gating-rhel: +/rhel-gating: plan: import: url: https://pkgs.devel.redhat.com/git/tests/mysql - name: /plans/versioned/mysql84 + name: /plans/versioned/mysql84/gating +/rhel-no-gating: + plan: + import: + url: https://pkgs.devel.redhat.com/git/tests/mysql + name: /plans/versioned/mysql84/no-gating From 6df108e73d0d9e464cb8cfdfd6b05f56eed4e8b0 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 19 Nov 2025 17:50:17 +0100 Subject: [PATCH 4/4] Rebase to MySQL 8.4.7 -- Testsuite results for the 8.4.7 release verified There were some failing tests: | auth_sec.admin_channel_tls | auth_sec.admin_channel_tls_startup | auth_sec.cert_verify | auth_sec.cert_verify_openssl | x.mysqlxtest_mode_ssl | x.mysqlxtest_mode_ssl_unixsocket and all of them fail because the test certificates in the 'std_data' testsuite directory have expired. Some of those tests fail gracefuly, some not. But all of them produce variant of this error message: "Server SSL certificate doesn't verify: certificate has expired" -- I believe this is a recuring timebomb bug in MySQL. I found this upstream commit dealing with the issue few years ago: https://github.com/mysql/mysql-server/commit/8c22b5f6df99f9b055c62ccf57e9e634e280abc5 but this time different certificates needs refreshing, e.g.: | std_data/server-cert-verify-fail.pem | std_data/server-cert-verify-pass.pem and maybe some more. -- Resolves: RHEL-128143 --- mysql8.4.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mysql8.4.spec b/mysql8.4.spec index 771aa7d..0a5287b 100644 --- a/mysql8.4.spec +++ b/mysql8.4.spec @@ -2,7 +2,7 @@ ExcludeArch: %{ix86} # Name of the package without any prefixes %global majorname mysql -%global package_version 8.4.6 +%global package_version 8.4.7 %global majorversion %(echo %{package_version} | cut -d'.' -f1-2 ) %global pkgnamepatch mysql @@ -21,7 +21,7 @@ ExcludeArch: %{ix86} # 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 8.4.6 +%global last_tested_version 8.4.7 # Set to 1 to force run the testsuite even if it was already tested in current version %global force_run_testsuite 0 @@ -104,7 +104,7 @@ ExcludeArch: %{ix86} Name: %{majorname}%{majorversion} Version: %{package_version} -Release: 2%{?with_debug:.debug}%{?dist} +Release: 1%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -1133,6 +1133,9 @@ popd %endif %changelog +* Thu Oct 30 2025 Pavol Sloboda - 8.4.7-1 +- Rebase to 8.4.7 + * Thu Jul 24 2025 Pavol Sloboda - 8.4.6-1 - Rebase to 8.4.6 diff --git a/sources b/sources index 458e60b..99a2f70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-8.4.6.tar.gz) = 2d498dc71eeede4368bd70fb1d1c012abd774732e341312f469afa3823c3b37489032b3290fa7531fb78c2b36251dbd1b8e1554c9330e18e56407f96fb8d4a1e +SHA512 (mysql-8.4.7.tar.gz) = d9596395b176490d5e58be307c2f82f55c9acd3206c1ba29bdb8c96c67438bbe5594621f601161ccb77f56c8262d00255ab6fd8aa62db61c80a1721e3d4e45a2