Skip to content

Commit 5f616f4

Browse files
akshatnehragrooverdan
authored andcommitted
MDEV-37446 Fix upgrade test RPM URLs and update version paths
Replace broken URLs of boost-program-options and openssl1.1 with archives.fedoraproject.org for stable RPM access. Update upgrade paths by removing 10.3/10.4 and adding 11.8 version. All new code of the whole pull request, including one or several files that are either new files or modified ones, are contributed under the BSD-new license. I am contributing on behalf of my employer Amazon Web Services, Inc.
1 parent 8e9213d commit 5f616f4

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -530,14 +530,12 @@ fedora upgrade-from:
530530
matrix:
531531
# Get latest versions of all major versions
532532
- UPGRADE_PATH:
533-
- "10.6>11.4"
534-
- "10.3"
535-
- "10.4"
536-
- "10.4.8" # Test unexpected table rebuilds as in https://jira.mariadb.org/browse/MDEV-28727
533+
- "10.6>11.8"
537534
- "10.5"
538535
- "10.6"
539536
- "10.11"
540537
- "11.4"
538+
- "11.8"
541539
script:
542540
- |
543541
if [[ $UPGRADE_PATH == *">"* ]]; then

tests/upgrade_from/test_upgrade.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,11 @@ EOF
158158
[[ $latest_distro == 34 ]] && dnf install -y https://repo.almalinux.org/almalinux/9/AppStream/x86_64/os/Packages/boost-program-options-1.75.0-8.el9.x86_64.rpm \
159159
https://vault.centos.org/centos/8/AppStream/x86_64/os/Packages/liburing-1.0.7-3.el8.x86_64.rpm
160160
[[ $latest_distro == 35 ]] && dnf install -y https://archives.fedoraproject.org/pub/archive/fedora/linux/updates/36/Everything/x86_64/Packages/b/boost-program-options-1.76.0-12.fc36.x86_64.rpm
161-
[[ $latest_distro -le 35 ]] && dnf install -y https://dl.fedoraproject.org/pub/fedora/linux/releases/39/Everything/x86_64/os/Packages/o/openssl1.1-1.1.1q-5.fc39.x86_64.rpm
161+
[[ $latest_distro -le 35 ]] && dnf install -y https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/39/Everything/x86_64/os/Packages/o/openssl1.1-1.1.1q-5.fc39.x86_64.rpm
162162
# galera-4 needs boost-program-options-1.81.0. Try installing from default repository first.
163163
[[ $latest_distro -ge 39 ]] &&
164164
(dnf install -y boost-program-options-1.81.0 ||
165-
dnf install -y https://rpmfind.net/linux/fedora/linux/releases/39/Everything/x86_64/os/Packages/b/boost-program-options-1.81.0-8.fc39.x86_64.rpm)
165+
dnf install -y https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/39/Everything/x86_64/os/Packages/b/boost-program-options-1.81.0-8.fc39.x86_64.rpm)
166166
if [[ $major_version == "10.4" ]] && [[ $minor_version -ge 24 ]]; then
167167
log "RPMs not available for version 10.4.24+ from this repository. You may try testing by installing from the .tar.gz binaries."
168168
exit 1

0 commit comments

Comments
 (0)