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; diff --git a/t/lib/Dockerfile.environ.mariadb.experimental b/t/lib/Dockerfile.environ.mariadb.experimental index 1dcf46c6..1b4ac930 100644 --- a/t/lib/Dockerfile.environ.mariadb.experimental +++ b/t/lib/Dockerfile.environ.mariadb.experimental @@ -4,8 +4,10 @@ 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.4/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