Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DAOS-16835: update to b65c188 #40

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+1,940 −62
Open

DAOS-16835: update to b65c188 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6306dd
test update to latest
daltonbohning Nov 26, 2024
386d9d2
update packaging
daltonbohning Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,942 changes: 1,903 additions & 39 deletions ...30bca5dc2476418a3833a15ab812d636e78.patch → ...88e82f2514faafe4633586e38957755a7b1.patch
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a shame, or rather a pity that the last official release was nearly 3 years ago. There has been 57 commits with 55 files changed since then.

Can we nudge them to do a newer release?

Copy link
Contributor Author

@daltonbohning daltonbohning Nov 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think 0.12 is coming soon. The repo has some new maintainers now and they have been much more active recently

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0.12 is the motivation for this PR - I want to make sure things are still working as soon as possible

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
NAME := mpifileutils
SRC_EXT := gz
REPO_NAME := mpifileutils-pkg
PKG_GIT_COMMIT := 0a4c530bca5dc2476418a3833a15ab812d636e78
PKG_GIT_COMMIT := b65c188e82f2514faafe4633586e38957755a7b1
GITHUB_PROJECT := hpc/$(NAME)

TEST_PACKAGES := $(NAME)-mpich-devel $(NAME)-openmpi3-devel
Expand Down
5 changes: 4 additions & 1 deletion mpifileutils.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

Name: mpifileutils
Version: 0.11.1
Release: 7%{?commit:.g%{shortcommit}}%{?dist}
Release: 8%{?commit:.g%{shortcommit}}%{?dist}
Summary: File utilities designed for scalability and performance

Group: System Environment/Libraries
Expand Down Expand Up @@ -276,6 +276,9 @@ done
%endif

%changelog
* Tue Nov 26 2024 Dalton A. Bohning <dalton.bohning@intel.com> - 0.11.1-8
- Update to patch b65c188

* Thu Apr 11 2024 Dalton A. Bohning <dalton.bohning@intel.com> - 0.11.1-7
- Update to patch 0a4c530

Expand Down
8 changes: 5 additions & 3 deletions packaging/Dockerfile.mockbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,12 @@ ARG UID=1000
# Add build user (to keep rpmbuild happy)
ENV USER build
ENV PASSWD build
RUN useradd -u $UID -ms /bin/bash $USER
RUN echo "$USER:$PASSWD" | chpasswd
# add the user to the mock group so it can run mock
RUN usermod -a -G mock $USER
RUN if [ $UID != 0 ]; then \
useradd -u $UID -ms /bin/bash $USER; \
echo "$USER:$PASSWD" | chpasswd; \
usermod -a -G mock $USER; \
fi

ARG CB0
RUN dnf -y upgrade && \
Expand Down
25 changes: 11 additions & 14 deletions packaging/Dockerfile.ubuntu.20.04
View file
Open in desktop
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
6 changes: 6 additions & 0 deletions packaging/Makefile_packaging.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ TEST_PACKAGES ?= ${NAME}
# unfortunately we cannot always name the repo the same as the project
REPO_NAME ?= $(NAME)

ifneq ($(CI_PR_REPOS),)
PR_REPOS ?= $(CI_PR_REPOS)
else
PR_REPOS ?= $(shell git show -s --format=%B | sed -ne 's/^PR-repos: *\(.*\)/\1/p')
endif
LEAP_15_PR_REPOS ?= $(shell git show -s --format=%B | sed -ne 's/^PR-repos-leap15: *\(.*\)/\1/p')
EL_7_PR_REPOS ?= $(shell git show -s --format=%B | sed -ne 's/^PR-repos-el7: *\(.*\)/\1/p')
EL_8_PR_REPOS ?= $(shell git show -s --format=%B | sed -ne 's/^PR-repos-el8: *\(.*\)/\1/p')
Expand Down Expand Up @@ -424,6 +428,8 @@ packaging_check:
--exclude libfabric.spec \
--exclude Makefile \
--exclude README.md \
--exclude SECURITY.md \
--exclude LICENSE \
--exclude _topdir \
--exclude \*.tar.\* \
--exclude \*.code-workspace \
Expand Down
2 changes: 1 addition & 1 deletion packaging/get_base_branch
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

set -eux -o pipefail
IFS=' ' read -r -a add_bases <<< "${1:-}"
origin=origin
origin="${ORIGIN:-origin}"
mapfile -t all_bases < <(echo "master"
git branch -r | sed -ne "/^ $origin\\/release\\/[0-9]/s/^ $origin\\///p")
all_bases+=("${add_bases[@]}")
Expand Down
12 changes: 9 additions & 3 deletions packaging/rpm_chrootbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ if [ -n "$DISTRO_VERSION" ]; then
releasever_opt=("--config-opts=releasever=$DISTRO_VERSION")
fi

bs_dir=/scratch/mock/cache/"${CHROOT_NAME}"-bootstrap
bs_dir=/scratch/mock/cache/"${CHROOT_NAME}"-bootstrap-$(id -u)
if ls -l "$bs_dir"/root_cache/cache.tar.gz; then
mkdir -p "/var/cache/mock/${CHROOT_NAME}-bootstrap/"
flock "$bs_dir" -c "cp -a $bs_dir/root_cache /var/cache/mock/${CHROOT_NAME}-bootstrap"
Expand All @@ -129,10 +129,16 @@ fi
# Save the ccache
if [ -d /scratch/ ]; then
mkdir -p "$bs_dir"/
flock "$bs_dir" -c "tar -czf $bs_dir/ccache-$CHROOT_NAME-$PACKAGE.tar.gz /var/cache/mock/${CHROOT_NAME}/ccache"
if ! flock "$bs_dir" -c "tar -czf $bs_dir/ccache-$CHROOT_NAME-$PACKAGE.tar.gz /var/cache/mock/${CHROOT_NAME}/ccache"; then
echo "Failed to save ccache. Plowing onward."
echo "I am $(id)"
fi
if ls -l /var/cache/mock/"${CHROOT_NAME}"-bootstrap/root_cache/cache.tar.gz; then
if ! cmp /var/cache/mock/"${CHROOT_NAME}"-bootstrap/root_cache/cache.tar.gz "$bs_dir"/root_cache/cache.tar.gz; then
flock "$bs_dir" -c "cp -a /var/cache/mock/${CHROOT_NAME}-bootstrap/root_cache $bs_dir/"
if ! flock "$bs_dir" -c "cp -a /var/cache/mock/${CHROOT_NAME}-bootstrap/root_cache $bs_dir/"; then
echo "Failed to save root_cache. Plowing onward."
echo "I am $(id)"
fi
fi
fi
fi
Expand Down