From b32713d4d8193e01b2330e6e4e27bff2443f1a5a Mon Sep 17 00:00:00 2001 From: Andrii Nikitin Date: Fri, 29 Sep 2023 12:16:52 +0200 Subject: [PATCH] t: Move container tests to from leap 15.4 to 15.5 --- t/lib/Dockerfile.environ.mariadb | 6 +++--- t/lib/Dockerfile.environ.mariadb.experimental | 10 +++++----- t/lib/Dockerfile.environ.postgresql | 4 ++-- t/lib/Dockerfile.systemd.mariadb | 4 ++-- t/lib/Dockerfile.systemd.postgresql | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/t/lib/Dockerfile.environ.mariadb b/t/lib/Dockerfile.environ.mariadb index 7d050212..365350cd 100644 --- a/t/lib/Dockerfile.environ.mariadb +++ b/t/lib/Dockerfile.environ.mariadb @@ -1,11 +1,11 @@ -FROM opensuse/leap:15.4 +FROM opensuse/leap:15.5 ENV container docker ENV LANG en_US.UTF-8 RUN sed -i 's,http://download.opensuse.org,http://mirrorcache.opensuse.org/download,g' /etc/zypp/repos.d/*repo -RUN zypper ar -f http://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.4 mc -RUN zypper ar -f http://mirrorcache.opensuse.org/repositories/devel:/languages:/perl/15.4 perl +RUN zypper ar -f http://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.5 mc +RUN zypper ar -f http://mirrorcache.opensuse.org/repositories/devel:/languages:/perl/15.5 perl RUN zypper --gpg-auto-import-keys ref # install MirrorCache here to fetch all dependencies diff --git a/t/lib/Dockerfile.environ.mariadb.experimental b/t/lib/Dockerfile.environ.mariadb.experimental index bc4dc1b5..40183e08 100644 --- a/t/lib/Dockerfile.environ.mariadb.experimental +++ b/t/lib/Dockerfile.environ.mariadb.experimental @@ -1,12 +1,12 @@ -FROM opensuse/leap:15.4 +FROM opensuse/leap:15.5 ENV container docker ENV LANG en_US.UTF-8 -RUN sed -i 's,http://download.opensuse.org,http://mirrorcache.opensuse.org/download,g' /etc/zypp/repos.d/*repo -RUN zypper ar -f http://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.4 mc -RUN zypper ar -f http://mirrorcache.opensuse.org/repositories/devel:/languages:/perl/15.4 perl -RUN zypper ar -f https://mirror.mariadb.org/yum/11.0.1/sles/15.4/x86_64 mariadb +RUN zypper -n in curl # rpm --import needs curl atm +RUN zypper ar -f http://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.5 mc +RUN zypper ar -f http://mirrorcache.opensuse.org/repositories/devel:/languages:/perl/15.5 perl +RUN zypper ar -f https://mirror.mariadb.org/yum/11.2.1/sles/15/x86_64 mariadb RUN rpm --import https://yum.mariadb.org/RPM-GPG-KEY-MariaDB RUN zypper --gpg-auto-import-keys ref diff --git a/t/lib/Dockerfile.environ.postgresql b/t/lib/Dockerfile.environ.postgresql index 0d71ee7f..00381acb 100644 --- a/t/lib/Dockerfile.environ.postgresql +++ b/t/lib/Dockerfile.environ.postgresql @@ -1,10 +1,10 @@ -FROM opensuse/leap:15.4 +FROM opensuse/leap:15.5 ENV container docker ENV LANG en_US.UTF-8 RUN sed -i 's,http://download.opensuse.org,http://mirrorcache.opensuse.org/download,g' /etc/zypp/repos.d/*repo -RUN zypper ar -f http://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.4 mc +RUN zypper ar -f http://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.5 mc RUN zypper --gpg-auto-import-keys ref # install MirrorCache here to fetch all dependencies diff --git a/t/lib/Dockerfile.systemd.mariadb b/t/lib/Dockerfile.systemd.mariadb index 76148266..4df4b1cd 100644 --- a/t/lib/Dockerfile.systemd.mariadb +++ b/t/lib/Dockerfile.systemd.mariadb @@ -1,9 +1,9 @@ -FROM registry.opensuse.org/opensuse/leap:15.4 +FROM registry.opensuse.org/opensuse/leap:15.5 ENV container podman ENV LANG en_US.UTF-8 -RUN zypper ar -f http://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.4 mc +RUN zypper ar -f http://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.5 mc RUN zypper --gpg-auto-import-keys ref RUN zypper -vvvn install systemd curl sudo iputils vi diff --git a/t/lib/Dockerfile.systemd.postgresql b/t/lib/Dockerfile.systemd.postgresql index a17724b4..60e21942 100644 --- a/t/lib/Dockerfile.systemd.postgresql +++ b/t/lib/Dockerfile.systemd.postgresql @@ -1,9 +1,9 @@ -FROM registry.opensuse.org/opensuse/leap:15.4 +FROM registry.opensuse.org/opensuse/leap:15.5 ENV container podman ENV LANG en_US.UTF-8 -RUN zypper ar -f http://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.4 mc +RUN zypper ar -f http://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.5 mc RUN zypper --gpg-auto-import-keys ref RUN zypper -vvvn install systemd curl sudo iputils vi