Skip to content

Commit aed87f1

Browse files
fauustgrooverdan
authored andcommitted
Change MDBF mirror URL
As as discussed with @dbart we decided to move https://deb.mariadb.org/repo to https://deb.mariadb.org so that a request on https://deb.mariadb.org will end up directly in https://mirror.mariadb.org/repo. The same behavior was configured for rpms (https://rpm.mariadb.org --> https://mirror.mariadb.org/yum) this also makes the old yum.mariadb.org service transparently compatible with this new service (after DNS change to point to rpm.mariadb.org). See also: https://jira.mariadb.org/browse/MDBF-297
1 parent 6a3545d commit aed87f1

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

debian/salsa-ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ mariadb.org-10.5 to mariadb-10.5 upgrade:
519519
- *test-prepare-container
520520
- apt install -y curl
521521
- curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
522-
- echo "deb https://deb.mariadb.org/repo/10.5/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list
522+
- echo "deb https://deb.mariadb.org/10.5/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list
523523
- apt-get update
524524
# The 10.5.9 release is missing mariadb-plugin-columnstore, define all other packages but it to avoid hitting the error:
525525
# The following packages have unmet dependencies:
@@ -539,7 +539,7 @@ mariadb.org-10.5 to mariadb-10.5 upgrade:
539539
- *test-verify-final
540540
variables:
541541
GIT_STRATEGY: none
542-
RELEASE: bullseye # Last Debian release that MariaDB.org publised 10.5 binaries for
542+
RELEASE: bullseye # Last Debian release that MariaDB.org published 10.5 binaries for
543543
except:
544544
variables:
545545
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
@@ -558,7 +558,7 @@ mariadb.org-10.4 to mariadb-10.5 upgrade:
558558
- *test-prepare-container
559559
- apt install -y curl
560560
- curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
561-
- echo "deb https://deb.mariadb.org/repo/10.4/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list
561+
- echo "deb https://deb.mariadb.org/10.4/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list
562562
- apt-get update
563563
- apt-get install -y mariadb-server-10.4
564564
# MariaDB.org version of 10.4 and early 10.5 do not install an init file, so
@@ -572,7 +572,7 @@ mariadb.org-10.4 to mariadb-10.5 upgrade:
572572
- *test-verify-final
573573
variables:
574574
GIT_STRATEGY: none
575-
RELEASE: buster # Last Debian release that MariaDB.org publised 10.4 binaries for
575+
RELEASE: buster # Last Debian release that MariaDB.org published 10.4 binaries for
576576
except:
577577
variables:
578578
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
@@ -591,7 +591,7 @@ mariadb.org-10.3 to mariadb-10.5 upgrade:
591591
- *test-prepare-container
592592
- apt install -y curl
593593
- curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
594-
- echo "deb https://deb.mariadb.org/repo/10.3/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list
594+
- echo "deb https://deb.mariadb.org/10.3/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list
595595
- apt-get update
596596
- apt-get install -y mariadb-server-10.3
597597
- *test-verify-initial
@@ -605,7 +605,7 @@ mariadb.org-10.3 to mariadb-10.5 upgrade:
605605
- *test-verify-final
606606
variables:
607607
GIT_STRATEGY: none
608-
RELEASE: buster # Last Debian release that MariaDB.org publised 10.3 binaries for
608+
RELEASE: buster # Last Debian release that MariaDB.org published 10.3 binaries for
609609
except:
610610
variables:
611611
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
@@ -624,7 +624,7 @@ mariadb.org-10.2 to mariadb-10.5 upgrade:
624624
- *test-prepare-container
625625
- apt install -y curl apt-transport-https
626626
- curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
627-
- echo "deb https://deb.mariadb.org/repo/10.2/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list
627+
- echo "deb https://deb.mariadb.org/10.2/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list
628628
- apt-get update
629629
- apt-get install -y mariadb-server-10.2
630630
# Verify initial state before upgrade
@@ -657,7 +657,7 @@ mariadb.org-10.2 to mariadb-10.5 upgrade:
657657
- *test-verify-final
658658
variables:
659659
GIT_STRATEGY: none
660-
RELEASE: stretch # Last Debian release that MariaDB.org publised 10.2 binaries for
660+
RELEASE: stretch # Last Debian release that MariaDB.org published 10.2 binaries for
661661
except:
662662
variables:
663663
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/

0 commit comments

Comments
 (0)