From 72f60964cb8066abf593b4d94b116e493b46107d Mon Sep 17 00:00:00 2001 From: Jeff Olivier Date: Wed, 5 Jun 2024 15:27:41 -0600 Subject: [PATCH] Backport two CI related patches (#14518) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DAOS-15959 cart: Add valgrind suppressions for Go runtime (#14507) Another Valgrind false positive. DAOS-623 build: Update packaging to… (#14513) Pick up a fix from the packaging repo for getting the HPE repository signing key from our Artifactory instead of he HPE servers. This insulates us from management issues with their server such as when they forget to update their certificate. Signed-off-by: Brian J. Murrell Signed-off-by: Jeff Olivier Co-authored-by: Kris Jacque --- src/cart/utils/memcheck-cart.supp | 10 ++++++++ utils/rpms/packaging/Dockerfile.ubuntu.20.04 | 25 +++++++++----------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/cart/utils/memcheck-cart.supp b/src/cart/utils/memcheck-cart.supp index 82a5251490c..e4f6a57f426 100644 --- a/src/cart/utils/memcheck-cart.supp +++ b/src/cart/utils/memcheck-cart.supp @@ -572,3 +572,13 @@ Memcheck:Addr1 fun:racecallatomic } +{ + Go runtime cgo malloc + Memcheck:Leak + match-leak-kinds: reachable + fun:malloc + fun:_cgo_b68ed06c1ed7_Cfunc__Cmalloc + fun:runtime.asmcgocall.abi0 + ... + fun:racecall +} diff --git a/utils/rpms/packaging/Dockerfile.ubuntu.20.04 b/utils/rpms/packaging/Dockerfile.ubuntu.20.04 index c2b1828559d..8809a626354 100644 --- a/utils/rpms/packaging/Dockerfile.ubuntu.20.04 +++ b/utils/rpms/packaging/Dockerfile.ubuntu.20.04 @@ -18,26 +18,23 @@ RUN if [ -n "$REPO_FILE_URL" ]; then \ true > ../sources.list && \ mv daos_ci-ubuntu20.04-artifactory.list.tmp \ daos_ci-ubuntu20.04-artifactory.list; \ + url="${REPO_FILE_URL%/*/}/hpe-ilorest-ubuntu-bionic-proxy/"; \ + else \ + url="https://downloads.linux.hpe.com/SDR/repo/ilorest/"; \ fi; \ cd -; \ - curl -f -O "$REPO_FILE_URL"esad_repo.key; \ - gpg --no-default-keyring --keyring ./temp-keyring.gpg \ - --import esad_repo.key; \ mkdir -p /usr/local/share/keyrings/; \ + curl -f -O "$url"GPG-KEY-hprest; \ + gpg --no-default-keyring --keyring ./temp-keyring.gpg \ + --import GPG-KEY-hprest; \ gpg --no-default-keyring --keyring ./temp-keyring.gpg --export \ - --output /usr/local/share/keyrings/daos-stack-public.gpg; \ + --output /usr/local/share/keyrings/hpe-sdr-public.gpg; \ rm ./temp-keyring.gpg; \ - url_prefix=https://downloads.linux.hpe.com/SDR/; \ - for url in hpPublicKey2048.pub \ - hpPublicKey2048_key1.pub \ - hpePublicKey2048_key1.pub; do \ - curl -f -O "$url_prefix$url"; \ - gpg --no-default-keyring --keyring ./temp-keyring.gpg \ - --import "$(basename $url)"; \ - done; \ + curl -f -O "$REPO_FILE_URL"esad_repo.key; \ + gpg --no-default-keyring --keyring ./temp-keyring.gpg \ + --import esad_repo.key; \ gpg --no-default-keyring --keyring ./temp-keyring.gpg --export \ - --output /usr/local/share/keyrings/hpe-sdr-public.gpg; \ - rm ./temp-keyring.gpg + --output /usr/local/share/keyrings/daos-stack-public.gpg # Install basic tools RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \