From cd5e74a197c0e626a55d21fcd04d188d41f8ec56 Mon Sep 17 00:00:00 2001 From: Andrii Nikitin <46994839+andrii-suse@users.noreply.github.com> Date: Wed, 3 Jun 2026 09:52:30 +0200 Subject: [PATCH 1/4] Add ua to avoid_countries for ru and by --- lib/MirrorCache/Datamodule.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/MirrorCache/Datamodule.pm b/lib/MirrorCache/Datamodule.pm index 0995f2a0..5e233a58 100644 --- a/lib/MirrorCache/Datamodule.pm +++ b/lib/MirrorCache/Datamodule.pm @@ -519,6 +519,7 @@ sub _init_location($self) { my $p = $query->param('AVOID_COUNTRY'); my @avoid_countries = (); @avoid_countries = ('by', 'ru') if $sanctioned_countries->{$country}; + @avoid_countries = ('ua') if $country eq 'ru' || $country eq 'by'; if ($p) { for my $c (split ',', $p) { next unless length($c) == 2; From 1963ea4234884b9ec9814f52bad9f7f8f8808b60 Mon Sep 17 00:00:00 2001 From: Andrii Nikitin <46994839+andrii-suse@users.noreply.github.com> Date: Wed, 3 Jun 2026 10:56:29 +0200 Subject: [PATCH 2/4] t: bump experimental MariaDB to 11.8 --- t/lib/Dockerfile.environ.mariadb.experimental | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/lib/Dockerfile.environ.mariadb.experimental b/t/lib/Dockerfile.environ.mariadb.experimental index 1dcf46c6..88d9e957 100644 --- a/t/lib/Dockerfile.environ.mariadb.experimental +++ b/t/lib/Dockerfile.environ.mariadb.experimental @@ -5,7 +5,7 @@ ENV LANG en_US.UTF-8 RUN zypper -n in curl # rpm --import needs curl atm RUN zypper ar -f http://cdn.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.6 mc -RUN zypper ar -f https://mirror.mariadb.org/yum/11.4/sles15-amd64 mariadb +RUN zypper ar -f https://mirror.mariadb.org/yum/11.8/sles15-amd64 mariadb RUN rpm --import https://yum.mariadb.org/RPM-GPG-KEY-MariaDB RUN zypper --gpg-auto-import-keys ref From 02cb9b2909c405acedc70b730833a26cef8f47c8 Mon Sep 17 00:00:00 2001 From: Andrii Nikitin <46994839+andrii-suse@users.noreply.github.com> Date: Wed, 3 Jun 2026 11:36:22 +0200 Subject: [PATCH 3/4] t: debug with curl in MariaDB experimental container --- t/lib/Dockerfile.environ.mariadb.experimental | 1 + 1 file changed, 1 insertion(+) diff --git a/t/lib/Dockerfile.environ.mariadb.experimental b/t/lib/Dockerfile.environ.mariadb.experimental index 88d9e957..5bd4bc7a 100644 --- a/t/lib/Dockerfile.environ.mariadb.experimental +++ b/t/lib/Dockerfile.environ.mariadb.experimental @@ -4,6 +4,7 @@ ENV container docker ENV LANG en_US.UTF-8 RUN zypper -n in curl # rpm --import needs curl atm +RUN curl -IL https://mirror.mariadb.org/yum/11.8/sles15-amd64/repodata/repomd.xml RUN zypper ar -f http://cdn.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.6 mc RUN zypper ar -f https://mirror.mariadb.org/yum/11.8/sles15-amd64 mariadb RUN rpm --import https://yum.mariadb.org/RPM-GPG-KEY-MariaDB From f2d98c79e015a5262d64efe2cffd7ad6f1c2e1a7 Mon Sep 17 00:00:00 2001 From: Andrii Nikitin <46994839+andrii-suse@users.noreply.github.com> Date: Wed, 3 Jun 2026 11:49:31 +0200 Subject: [PATCH 4/4] t: switch to partucular mirror for MariaDB experimental Because CI receives 403 --- t/lib/Dockerfile.environ.mariadb.experimental | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/lib/Dockerfile.environ.mariadb.experimental b/t/lib/Dockerfile.environ.mariadb.experimental index 5bd4bc7a..1b4ac930 100644 --- a/t/lib/Dockerfile.environ.mariadb.experimental +++ b/t/lib/Dockerfile.environ.mariadb.experimental @@ -6,7 +6,8 @@ ENV LANG en_US.UTF-8 RUN zypper -n in curl # rpm --import needs curl atm RUN curl -IL https://mirror.mariadb.org/yum/11.8/sles15-amd64/repodata/repomd.xml RUN zypper ar -f http://cdn.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.6 mc -RUN zypper ar -f https://mirror.mariadb.org/yum/11.8/sles15-amd64 mariadb +# RUN zypper ar -f https://mirror.mariadb.org/yum/11.8/sles15-amd64 mariadb +RUN zypper ar -f https://mirror.netcologne.de/mariadb/mariadb-11.8.8/yum/sles/15.7/x86_64 mariadb RUN rpm --import https://yum.mariadb.org/RPM-GPG-KEY-MariaDB RUN zypper --gpg-auto-import-keys ref