From 01352b42c1e2f1eeb3980c9094c521a2ea42b297 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Wed, 18 Jan 2023 08:32:28 -0700 Subject: [PATCH] set retain to 1d --- sync/lh-release-sync-to-staging.sh | 107 ++++++++++++++++++++++++++ sync/minor-release-sync-to-staging.sh | 2 +- sync/prep-staging-8.sh | 4 +- 3 files changed, 110 insertions(+), 3 deletions(-) create mode 100644 sync/lh-release-sync-to-staging.sh diff --git a/sync/lh-release-sync-to-staging.sh b/sync/lh-release-sync-to-staging.sh new file mode 100644 index 0000000..846d457 --- /dev/null +++ b/sync/lh-release-sync-to-staging.sh @@ -0,0 +1,107 @@ +#!/bin/bash +# Performs a full on sync of a minor release, directories and all. It calls the +# other scripts in this directory to assist where necessary. +# Note that this is EL8 specific +# +# Source common variables +# shellcheck disable=SC2046,1091,1090 +source $(dirname "$0")/common + +# Major Version (eg, 8) +MAJ=${RLVER} + +# sync all pieces of a release, including extras, nfv, etc +for COMPOSE in "${NONSIG_COMPOSE[@]}"; do + echo "${COMPOSE}: Syncing" + pushd "${RELEASE_COMPOSE_ROOT}/compose" || { echo "${COMPOSE}: Failed to change directory"; break; } + + if [[ "${COMPOSE}" == "Rocky" ]]; then + # ISO Work before syncing + mkdir -p isos/{x86_64,aarch64} + + # Sort the ISO's + for ARCH in "${ARCHES[@]}"; do + for x in BaseOS Minimal; do + echo "${x} ${ARCH}: Moving ISO images" + mv "${x}/${ARCH}/iso/"* "isos/${ARCH}/" + done + pushd "isos/${ARCH}" || { echo "${ARCH}: Failed to change directory"; break; } + ln -s "Rocky-${REVISION}-${ARCH}-boot.iso" "Rocky-${ARCH}-boot.iso" + ln -s "Rocky-${REVISION}-${ARCH}-dvd1.iso" "Rocky-${ARCH}-dvd1.iso" + ln -s "Rocky-${REVISION}-${ARCH}-dvd1.iso" "Rocky-${ARCH}-dvd.iso" + ln -s "Rocky-${REVISION}-${ARCH}-minimal.iso" "Rocky-${ARCH}-minimal.iso" + for file in *.iso; do + printf "# %s: %s bytes\n%s\n" \ + "${file}" \ + "$(stat -c %s ${file})" \ + "$(sha256sum --tag ${file})" \ + | sudo tee -a CHECKSUM; + done + popd || { echo "Could not change directory"; break; } + done + fi + + TARGET="${STAGING_ROOT}/${CATEGORY_STUB}/${REV}" + mkdir -p "${TARGET}" + # disabling because none of our files should be starting with dashes. If they + # are something is *seriously* wrong here. + # shellcheck disable=SC2035 + sudo -l && find **/* -maxdepth 0 -type d | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable \ + {} "${TARGET}" + + if [[ "${COMPOSE}" == "Rocky" ]]; then + cp COMPOSE_ID "${TARGET}" + chown 10004:10005 "${TARGET}/COMPOSE_ID" + rsync -av --chown=10004:10005 --progress --relative --human-readable metadata "${TARGET}" + fi + + # Return back to where we started + popd || { echo "${COMPOSE}: Failed to change back"; break; } + + # Create extra stuff + pushd "${TARGET}" || { echo "${COMPOSE}: Failed to change directory"; break; } + mkdir -p Live/x86_64 + ln -s Live live + popd || { echo "${COMPOSE}: Failed to change back"; break; } +done + + +# Create symlinks for repos that were once separate from the main compose +for LINK in "${LINK_REPOS[@]}"; do + ln -sr "${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/${LINK}" \ + "${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/${LINK_REPOS[$LINK]}" +done + +# make a kickstart directory +for ARCH in "${ARCHES[@]}"; do + for REPO in "${MODS_REPOS[@]}"; do + SOURCE="${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/${REPO}/${ARCH}/os" + TARGET="${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/${REPO}/${ARCH}/kickstart" + echo "Making golden kickstart directory" + cp -na "${SOURCE}" "${TARGET}" + done +done + +# fix treeinfo +for ARCH in "${ARCHES[@]}"; do + echo "Ensuring treeinfo is correct" + treeinfoModder "${ARCH}" + treeinfoModderKickstart "${ARCH}" + treeinfoSaver "${ARCH}" +done + +# sign all repos +echo "Signing all repositories" +test -f $(dirname "$0")/sign-repos-only.sh +ret_val=$? + +if [ "$ret_val" -eq 0 ]; then + $(dirname "$0")/sign-repos-only.sh +fi + +# Change Symlink if required +echo "Setting symlink to ${REV}" +pushd "${STAGING_ROOT}/${CATEGORY_STUB}" || exit +/bin/rm "${STAGING_ROOT}/${CATEGORY_STUB}/latest-8" +ln -sr "${STAGING_ROOT}/${CATEGORY_STUB}/${REV}" latest-8 +popd || exit diff --git a/sync/minor-release-sync-to-staging.sh b/sync/minor-release-sync-to-staging.sh index f671528..846d457 100644 --- a/sync/minor-release-sync-to-staging.sh +++ b/sync/minor-release-sync-to-staging.sh @@ -13,7 +13,7 @@ MAJ=${RLVER} # sync all pieces of a release, including extras, nfv, etc for COMPOSE in "${NONSIG_COMPOSE[@]}"; do echo "${COMPOSE}: Syncing" - pushd "/mnt/compose/${MAJ}/latest-${COMPOSE}-${MAJ}/compose" || { echo "${COMPOSE}: Failed to change directory"; break; } + pushd "${RELEASE_COMPOSE_ROOT}/compose" || { echo "${COMPOSE}: Failed to change directory"; break; } if [[ "${COMPOSE}" == "Rocky" ]]; then # ISO Work before syncing diff --git a/sync/prep-staging-8.sh b/sync/prep-staging-8.sh index c5c2c22..5f1e1e4 100644 --- a/sync/prep-staging-8.sh +++ b/sync/prep-staging-8.sh @@ -63,7 +63,7 @@ for x in "${ARCHES[@]}"; do if [ "$ret_val" -eq 0 ]; then createrepo --update "${STAGING_ROOT}/${RELEASE_DIR}/${y}/${x}/debug/tree" \ "--distro=cpe:/o:rocky:rocky:${REVISION:0:1},Rocky Linux ${REVISION:0:1}" \ - --workers 8 + --workers 8 --retain-old-md-by-age 1d sed -i '/<\/open-size>/d' \ "${STAGING_ROOT}/${RELEASE_DIR}/${y}/${x}/debug/tree/repodata/repomd.xml" test -f /root/bin/sign-repo.sh && /root/bin/sign-repo.sh \ @@ -83,7 +83,7 @@ for x in "${ARCHES[@]}"; do --groupfile="/mnt/compose/8/latest-Rocky-8/work/${x}/comps/comps-${y}.${x}.xml" \ --xz --revision="${REVISION}" \ "--distro=cpe:/o:rocky:rocky:${REVISION:0:1},Rocky Linux ${REVISION:0:1}" \ - --workers=8 --checksum=sha256 + --workers=8 --checksum=sha256 --retain-old-md-by-age 1d sed -i '/<\/open-size>/d' \ "${STAGING_ROOT}/${RELEASE_DIR}/${y}/${x}/os/repodata/repomd.xml" sed -i '/<\/open-size>/d' \