Merge pull request #44 from openhpc/2025-10-08-disk

Different fixes for 4.0.0 and 3.4.0

Author: adrianreber

ansible/roles/repos/files/RPM-GPG-KEY-OpenHPC-4

@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQENBGhc7mMBCADHq6eAbbriavyclOykSs5kJvt2IHp+Y72ZPHv4w7nO/8EvD9TP
+52xkmAzaSyP78sgPutL54vnSwOcyvGqCl/FfpqOSjxjzT28FoqaGGX47pIS3C4th
+5zuQFQZV+E+h1jwhwpUqcHE8TDULR8ijdl1Pkwqmj0atQh+970iA+l1a8nDH/g+T
+hbiGkDStzc5oz/xixLVO9wjcwgzV/nehdWJusgSlM+6xu/G1oojmT5oAR9hNSQ5d
+LlzkplpDFKTntHpITvE+plJZ05DAVCUMVcAdhXoe5vy3oGtWF1OSMIiyUIZu0J0x
+PDPgzas2QrxRox/PdEy1AI+6J9YO8H+d9P6VABEBAAG0J09wZW5IUEM0IE9CUyBQ
+cm9qZWN0IDxPcGVuSFBDNEBwcml2YXRlPokBVAQTAQgAPhYhBF4zPKOhvbvJ3xSd
+dAmt+uTXIqaSBQJoXO6PAhsDBQkpMuAsBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheA
+AAoJEAmt+uTXIqaSjOMH/1RDm6FcXgW7Ada4qxrbY26tfO7oPNFlmALIIf5l/Sps
+nZfiFJZGSNvWcS7DiqArogDoUNR5B43i28euS7VE9gX5ONHxy1Mx8mEQqLrZWtCE
+YVVwfRfg4buJnkg4r+RSfTM5hoLhMGTdpQ8/bns25/MFLvoWbn8GUtCIo9H/2H+g
+IOcHKgonVXSDyxQ75ZAHI4FRNz9hgUcs1XcacltdQ0bMNRA0sGALFgXdzYVqR+AX
+5sm/3DIKjhb/kSMNn+l5Wd17LOMGnKt3ZLuDg+aLKRf+/UpixtNjNYfMJnETZhGa
+VRB6Wbph77jWMSSpMYQcKLtgAWyf5mKscBbmsD6F1zuJATMEEwEIAB0WIQRTknRN
+PFQ+1XhHZeaKMGAZ2lZcbAUCaFzuZAAKCRCKMGAZ2lZcbFlYB/9ClIGH1O0q0oBc
+iIEiH7BULTB+bCGCCoKZTXmPJxDvDCJXtr7O45cVY2lg3AjlWkzp7QFiSVzONbEQ
+XE89lIeNev225yE8QWrOeyUDFh5WlT4BFYZ2r3kpCzfbEpLgbGCDTAw6iMwmV6+/
+3N9EWjG9ysJyWuuMB+td4+6KhYMwXdVAjIGGYdlSdCDfZmUSfx/u/syNfO5GxStd
+IDqjJ9Eef/dch2YPMbspSXXBP8K0T6FXiqHGWX2YO7mM/HJb3scp78qTqib/ONym
+9h1M5sKyQXGCM1XFNiStaU5byAN3PbjOlz2QALep9z20kAQ3Tf9rHSVVkesD3MgE
+1oSfHgJM
+=gqCt
+-----END PGP PUBLIC KEY BLOCK-----

ansible/roles/repos/files/mk_dist.sh

@@ -3,22 +3,23 @@
 set -o pipefail
 set -e
 
-DISTROS=("EL_9" "Leap_15" "openEuler_22.03")
+# Version-specific distributions
+DISTROS_V3=("EL_9" "Leap_15" "openEuler_22.03")
+DISTROS_V4=("EL_10" "openEuler_24.03")
 ARCHES=("x86_64" "aarch64")
 
 BASE_REPO_PATH="/repos/.staging/OpenHPC"
 DEST_DIR="/repos/dist/"
 TMPDIR="/repos/.staging/.tmp"
 MAKE_REPO_SH="/home/ohpc/bin/make_repo.sh"
-PUBLIC_KEY="/home/ohpc/RPM-GPG-KEY-OpenHPC-3"
 
 show_usage() {
 	echo "$0: script to create distribution tarballs"
 	echo "Usage:"
 	echo "  $0 [<options>]"
 	echo
 	echo "Options:"
-	echo "  -v <VERSION>   Create distribution tarballs for version <VERSRION>"
+	echo "  -v <VERSION>   Create distribution tarballs for version <VERSION>"
 	echo "  -h             Show this help"
 }
 
@@ -49,6 +50,23 @@ DEST_DIR="${DEST_DIR}/${VERSION}"
 VERSION_MAJOR=$(echo "${VERSION}" | awk -F. '{print $1}')
 VERSION_MINOR=$(echo "${VERSION}" | awk -F. '{print $2}')
 
+# Select distributions based on major version
+case "${VERSION_MAJOR}" in
+3)
+	DISTROS=("${DISTROS_V3[@]}")
+	;;
+4)
+	DISTROS=("${DISTROS_V4[@]}")
+	;;
+*)
+	echo "ERROR: Unsupported major version ${VERSION_MAJOR}. Supported versions: 3, 4"
+	exit 1
+	;;
+esac
+
+# Set version-specific GPG key path
+PUBLIC_KEY="/home/ohpc/RPM-GPG-KEY-OpenHPC-${VERSION_MAJOR}"
+
 if [ ! -d "${DEST_DIR}" ]; then
 	mkdir "${DEST_DIR}"
 fi
@@ -68,12 +86,12 @@ for DISTRO in "${DISTROS[@]}"; do
 	SRC="${BASE_REPO_PATH}/${VERSION_MAJOR}/${DISTRO}"
 	echo "--> Copying base repo contents from ${SRC}"
 	cp -aLl --reflink=auto "${SRC}" "${TMP_DIR}"
-	cat <<EOF >>"${TMP_DIR}/OpenHPC.local.repo"
+	cat <<EOF >"${TMP_DIR}/OpenHPC.local.repo"
 [OpenHPC-local]
 name=OpenHPC-${VERSION_MAJOR} - Base
 baseurl=file://@PATH@/${DISTRO}
 gpgcheck=1
-gpgkey=file://@PATH@/RPM-GPG-KEY-OpenHPC-3
+gpgkey=file://@PATH@/RPM-GPG-KEY-OpenHPC-${VERSION_MAJOR}
 EOF
 
 	if [[ "${VERSION_MINOR}" != "0" ]]; then
@@ -85,7 +103,7 @@ EOF
 name=OpenHPC-${VERSION} - Updates
 baseurl=file://@PATH@/${DISTRO}/updates
 gpgcheck=1
-gpgkey=file://@PATH@/RPM-GPG-KEY-OpenHPC-3
+gpgkey=file://@PATH@/RPM-GPG-KEY-OpenHPC-${VERSION_MAJOR}
 EOF
 		cp -aLl --reflink=auto "${SRC}" "${DEST}"
 	fi
@@ -135,7 +153,7 @@ EOF
 		fi
 
 		# add README
-		cat <<EOF >>"${TMP_DIR}/README"
+		cat <<EOF >"${TMP_DIR}/README"
 Many sites may find it useful or necessary to maintain a local copy of the
 OpenHPC repositories. To facilitate this need, we provide downloadable tar
 archives -- one containing a repository of binary packages as well as any