Skip to content

Commit

Permalink
Backport two CI related patches
Browse files Browse the repository at this point in the history
DAOS-15959 cart: Add valgrind suppressions for Go runtime (#14507)

Another Valgrind false positive.

Signed-off-by: Kris Jacque <kris.jacque@intel.com>

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 <brian.murrell@intel.com>
Signed-off-by: Jeff Olivier <jeffolivier@google.com>
  • Loading branch information
kjacque authored and jolivier23 committed Jun 5, 2024
1 parent 856daa0 commit a9f79b5
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 14 deletions.
10 changes: 10 additions & 0 deletions src/cart/utils/memcheck-cart.supp
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
25 changes: 11 additions & 14 deletions utils/rpms/packaging/Dockerfile.ubuntu.20.04
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit a9f79b5

Please sign in to comment.