From 1f526b7a6bddd2631d782071e1037a5eb6f71a4f Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Tue, 17 Sep 2024 10:47:01 +1000 Subject: [PATCH] MDBF-796: SLES - add eigen from science repository The eigen3-devel package information: https://software.opensuse.org/download/package?package=eigen3&project=science Change the temporary repositories to include gpg checks from the keys in the repo file. Added workaround for https://bugzilla.opensuse.org/show_bug.cgi?id=1228968 This makes the eigen3-devel and judy-devel package perform gpg checks. --- ci_build_images/sles.Dockerfile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ci_build_images/sles.Dockerfile b/ci_build_images/sles.Dockerfile index ee431155..2cff929e 100644 --- a/ci_build_images/sles.Dockerfile +++ b/ci_build_images/sles.Dockerfile @@ -17,7 +17,9 @@ RUN zypper -n update \ && ARCH=$(rpm --query --queryformat='%{ARCH}' zypper) \ && if [ "$ARCH" = x86_64 ]; then ARCH=amd64 ; fi \ && zypper addrepo https://ci.mariadb.org/galera/mariadb-4.x-latest-gal-"${ARCH}-${ID%%leap}-${VERSION_ID}".repo \ - && zypper -n install \ + # permissions -> https://bugzilla.opensuse.org/show_bug.cgi?id=1228968 workaround \ + && zypper -n install permissions; \ + zypper -n install \ bzip2 \ ccache \ check-devel \ @@ -56,11 +58,15 @@ RUN zypper -n update \ systemd-devel \ wget \ # temporary add opensuse oss repo for some deps \ - && zypper ar -f https://download.opensuse.org/distribution/leap/RELEASEVER/repo/oss/ repo-oss \ + && zypper addrepo https://download.opensuse.org/distribution/leap/RELEASEVER/repo/oss/ repo-oss \ && sed -i "s/RELEASEVER/\$releasever/" /etc/zypp/repos.d/repo-oss.repo \ - && zypper -n --no-gpg-checks install \ + # temp add since repo (no 15.6 version) for eigen3 \ + && zypper addrepo https://download.opensuse.org/repositories/science/SLE_15_SP5/science.repo \ + && zypper --gpg-auto-import-keys ref science repo-oss \ + && zypper -n install \ + eigen3-devel \ judy-devel \ - && rm /etc/zypp/repos.d/repo-oss.repo \ + && rm /etc/zypp/repos.d/repo-oss.repo /etc/zypp/repos.d/science.repo \ && zypper modifyrepo --enable SLE_BCI_source \ && ./mariadb_zypper_expect \ && zypper clean -a \