From 61ee610298a7f16bc3bb52243caef6db3865f73d Mon Sep 17 00:00:00 2001 From: Shane Canon Date: Fri, 6 Dec 2024 08:26:53 -0800 Subject: [PATCH 1/4] Prepare release 1.1.1 - Update changelog - Update version - Switch to getting version from code - Add version to infohpc --- CHANGELOG.md | 9 +++++++++ podman_hpc/podman_hpc.py | 4 ++++ setup.cfg | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e64892..d10244b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.1.1] - 2024-12-05 + +This is a patch release that primarily implements bugfixes and other minor updates. + +- Fix for missing layers that causes a migrated image to not show up on all nodes. +- Fix for duplicate tagging on migrated images. +- Fix for timeouts with shared run +- Adds convience modules for volume mounts + ## [1.1.0] - 2023-11-12 This is a minor release. It adds initial support for OpenMPI4/PMI2 and OpenMPI5/PMIx. diff --git a/podman_hpc/podman_hpc.py b/podman_hpc/podman_hpc.py index 685e570..9aa6187 100755 --- a/podman_hpc/podman_hpc.py +++ b/podman_hpc/podman_hpc.py @@ -15,6 +15,9 @@ from subprocess import Popen, PIPE +__version__ = "1.1.1" + + def _round_nearest(x, a): return round(x / a) * a @@ -156,6 +159,7 @@ def podhpc(ctx, additional_stores, squash_dir, log_level): @pass_siteconf def infohpc(siteconf): """Dump configuration information for podman_hpc.""" + print(f"Podman-HPC Version: {__version__}") siteconf.dump_config() sys.exit() diff --git a/setup.cfg b/setup.cfg index ecf233e..b02d530 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,7 @@ [metadata] name = podman-hpc -version = 1.1.0 +version = attr: podman_hpc.podman_hpc.__version__ + [options] packages = podman_hpc From 613d5660c1adeb76abfff11e3e5e4979ffc1c2a3 Mon Sep 17 00:00:00 2001 From: Shane Canon Date: Mon, 9 Dec 2024 15:35:05 -0800 Subject: [PATCH 2/4] Fix up RPM locations This fixes the /etc location so there aren't files in /usr/etc. This also allows getting the version for the rpm from the version file. --- .github/actions/build-podman-hpc/entrypoint.sh | 5 +++++ Makefile | 3 +-- podman-hpc.spec | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/actions/build-podman-hpc/entrypoint.sh b/.github/actions/build-podman-hpc/entrypoint.sh index 99b2782..448b69b 100755 --- a/.github/actions/build-podman-hpc/entrypoint.sh +++ b/.github/actions/build-podman-hpc/entrypoint.sh @@ -2,9 +2,14 @@ # build python packages DIST=dist +pip3 install . python3 -m build --outdir $DIST # build SRPM and RPM +OLD_VER=$(grep Version: podman-hpc.spec|sed 's/.* //') +VER=$(grep __version__.= podman_hpc/podman_hpc.py|sed 's/.*=..//'|sed 's/.$//') +sed -i "s/${OLD_VER}/${VER}/" podman-hpc.spec + RPMBUILD_TOPDIR=$(rpmbuild --eval="%{_topdir}") cp $DIST/*.tar.gz $RPMBUILD_TOPDIR/SOURCES/ rpmbuild -ba podman-hpc.spec diff --git a/Makefile b/Makefile index 36b6626..7eb7c09 100644 --- a/Makefile +++ b/Makefile @@ -11,10 +11,9 @@ build: echo "Nothing to do" rpmbuild-install: - python3 -m setup install --root=$(DESTDIR) --prefix=/usr + python3 -m setup install --root=$(DESTDIR) --prefix=/usr --install-data=/ python3 -m podman_hpc.configure_hooks \ --hooksd $(DESTDIR)/usr/share/containers/oci/hooks.d mkdir -p $(DESTDIR)/etc/ - ln -s ../usr/etc/podman_hpc $(DESTDIR)/etc/podman_hpc install: rpmbuild-install diff --git a/podman-hpc.spec b/podman-hpc.spec index 1c25e47..66ce412 100644 --- a/podman-hpc.spec +++ b/podman-hpc.spec @@ -14,7 +14,7 @@ Name: podman-hpc -Version: 1.1.0 +Version: 1.1.1 Release: 1 Summary: Scripts to enable Podman to run in an HPC environment # FIXME: Select a correct license from https://github.com/openSUSE/spec-cleaner#spdx-licenses @@ -48,7 +48,6 @@ run fully unprivileged. %license LICENSE %doc CHANGELOG.md README.md %config /etc/podman_hpc -%config /usr/etc/podman_hpc /usr/bin/podman-hpc /usr/bin/hook_tool /usr/bin/fuse-overlayfs-wrap From ffd43c147f9b37b151119a94a60029f0d342f3d6 Mon Sep 17 00:00:00 2001 From: Dan Fulton Date: Mon, 9 Dec 2024 16:44:32 -0800 Subject: [PATCH 3/4] Update Makefile I think we can lose this line ensuring the /etc dir is created, and if we retain it it should move before the first install line --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 7eb7c09..bcf9730 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,5 @@ rpmbuild-install: python3 -m setup install --root=$(DESTDIR) --prefix=/usr --install-data=/ python3 -m podman_hpc.configure_hooks \ --hooksd $(DESTDIR)/usr/share/containers/oci/hooks.d - mkdir -p $(DESTDIR)/etc/ install: rpmbuild-install From 103418b6ddb4e081271665675a99fea98f6e6a11 Mon Sep 17 00:00:00 2001 From: Shane Canon Date: Tue, 10 Dec 2024 08:21:53 -0800 Subject: [PATCH 4/4] Fix typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d10244b..dfcb503 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ This is a patch release that primarily implements bugfixes and other minor updat - Fix for missing layers that causes a migrated image to not show up on all nodes. - Fix for duplicate tagging on migrated images. - Fix for timeouts with shared run -- Adds convience modules for volume mounts +- Adds convenience modules for volume mounts ## [1.1.0] - 2023-11-12