sync: start to update scripts for 10 release method

Author: nazunalika

sync/common

@@ -36,8 +36,8 @@ SIG_VAULT_STUB="mirror/vault/sig"
 #RELEASE_DIR="${CATEGORY_STUB}/${REVISION}${APPEND_TO_DIR}"
 
 # Define arches we support
-# Override: Not Allowed
-ARCHES=(x86_64 aarch64)
+# Override: Set in relevant common file
+#ARCHES=()
 
 # Source Major common
 # Override: Not Allowed
@@ -69,6 +69,10 @@ REV="${REVISION}${APPEND_TO_DIR}"
 # Override: Allowed
 VARIANTS=(boot minimal dvd1 dvd)
 
+# Used to identify directories that should be removed
+# Override: Allowed
+NONREPO_DIRS=(Minimal Cloud)
+
 # Syncing functions
 function parallel_rsync_no_delete_staging() {
   local TARGET="${1}"
@@ -116,6 +120,7 @@ function rsync_no_delete_staging_pungi() {
     --exclude COMMUNITY-CHARTER \
     --exclude extra_files.json \
     --exclude Minimal \
+    --exclude Cloud \
     compose/ "${TARGET}"
 }
 
@@ -125,6 +130,7 @@ function rsync_no_delete_staging_with_excludes() {
   sudo -l && rsync -vrlptDSHog --chown=10004:10005 --progress --human-readable \
     --exclude "${EXCLUDE}" \
     --exclude Minimal \
+    --exclude Cloud \
     compose/ "${TARGET}"
 }
 
@@ -134,6 +140,7 @@ function rsync_delete_staging_with_excludes() {
   sudo -l && rsync -vrlptDSHog --chown=10004:10005 --progress --human-readable \
     --exclude "${EXCLUDE}" \
     --exclude Minimal \
+    --exclude Cloud \
     --delete \
     compose/ "${TARGET}"
 }
@@ -204,6 +211,7 @@ function rsync_no_delete_staging_pungi_dry() {
     --exclude COMMUNITY-CHARTER \
     --exclude extra_files.json \
     --exclude Minimal \
+    --exclude Cloud \
     --dry-run \
     compose/ "${TARGET}"
 }
@@ -214,6 +222,7 @@ function rsync_no_delete_staging_with_excludes_dry() {
   sudo -l && rsync -vrlptDSHog --chown=10004:10005 --progress --human-readable \
     --exclude "${EXCLUDE}" \
     --exclude Minimal \
+    --exclude Cloud \
     --dry-run \
     compose/ "${TARGET}"
 }
@@ -224,6 +233,7 @@ function rsync_delete_staging_with_excludes_dry() {
   sudo -l && rsync -vrlptDSHog --chown=10004:10005 --progress --human-readable \
     --exclude "${EXCLUDE}" \
     --exclude Minimal \
+    --exclude Cloud \
     --dry-run \
     compose/ "${TARGET}"
 }

sync/common_10

@@ -25,7 +25,9 @@ esac
 
 MAJOR="${REVISION%.*}"
 MINOR="${REVISION#*.}"
-ARCHES=(x86_64 aarch64 ppc64le s390x)
+ARCHES=(x86_64 aarch64 ppc64le s390x riscv64)
+ISO_TYPES=(BaseOS Minimal)
+IMAGE_TYPES=(Cloud Live)
 STAGING_ROOT="/mnt/repos-staging"
 PRODUCTION_ROOT="/mnt/repos-production"
 

sync/common_8

@@ -26,6 +26,8 @@ esac
 
 MAJOR="${REVISION%.*}"
 MINOR="${REVISION#*.}"
+ARCHES=(x86_64 aarch64)
+ISO_TYPES=(BaseOS Minimal)
 STAGING_ROOT="/mnt/repos-staging"
 PRODUCTION_ROOT="/mnt/repos-production"
 

sync/lh-release-sync-to-staging.sh

@@ -12,7 +12,7 @@ source $(dirname "$0")/common
 # Major Version (eg, 8)
 MAJ=${RLVER}
 
-if [[ "${RLVER}" -eq "9" ]]; then
+if [[ "${MAJ}" -eq "9" ]]; then
   echo "Invalid release"
   exit 1
 fi
@@ -25,11 +25,13 @@ for COMPOSE in "${NONSIG_COMPOSE[@]}"; do
 
   if [[ "${COMPOSE}" == "Rocky" ]]; then
     # ISO Work before syncing
-    mkdir -p isos/{x86_64,aarch64}
+    for ARCH in "${ARCHES[@]}"; do
+      mkdir -p isos/${ARCH}
+    done
 
     # Sort the ISO's
     for ARCH in "${ARCHES[@]}"; do
-      for x in BaseOS Minimal; do
+      for x in "${ISO_TYPES[@]}"; do
         if [[ "${x}" != "BaseOS" ]]; then
           echo "${x} ${ARCH}: Removing unnecessary boot image"
           /bin/rm -v "${x}/${ARCH}/iso/Rocky-${REVISION}-20"*"${ARCH}"*.iso
@@ -38,21 +40,22 @@ for COMPOSE in "${NONSIG_COMPOSE[@]}"; do
         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} -L)" \
           "$(sha256sum --tag ${file})" \
-        | sudo tee -a CHECKSUM;
+        | sudo tee -a "${file}.CHECKSUM"
       done
+      cat ./*.CHECKSUM > CHECKSUM
       popd || { echo "Could not change directory"; break; }
     done
-    mkdir -p live/x86_64
-    ln -s live Live
+    # Sort the cloud images here. Probably just a directory move.
+    # Live images should probably be fine. Check anyway what we want to do.
+    # Delete the unnecessary dirs here.
+    for EMPTYDIR in "${NONREPO_DIRS[@]}"; do
+      rm -rf "${EMPTYDIR}"
+    done
   fi
   popd || { echo "${COMPOSE}: Failed to change directory"; break; }
 
@@ -67,7 +70,6 @@ for COMPOSE in "${NONSIG_COMPOSE[@]}"; do
   popd || { echo "${COMPOSE}: Failed to change directory"; 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}" \

sync/minor-release-sync-to-staging.sh

@@ -10,7 +10,7 @@ source $(dirname "$0")/common
 # Major Version (eg, 8)
 MAJ=${RLVER}
 
-if [ "${MAJ}" == "9" ]; then
+if [ "${MAJ}" -eq "9" ]; then
   echo "Does not work for Rocky Linux 9. Please use sync-to-staging"
   exit 32
 fi
@@ -23,21 +23,22 @@ for COMPOSE in "${NONSIG_COMPOSE[@]}"; do
 
   if [[ "${COMPOSE}" == "Rocky" ]]; then
     # ISO Work before syncing
-    mkdir -p isos/{x86_64,aarch64}
+    for ARCH in "${ARCHES[@]}"; do
+      mkdir -p "isos/${ARCH}"
+    done
 
     # Sort the ISO's
     for ARCH in "${ARCHES[@]}"; do
-      for x in BaseOS Minimal; do
+      for x in "${ISO_TYPES[@]}"; do
+        ## Check if the ISO even exists, if not skip
+        ## this is done using "continue" in a for loop
         echo "${x} ${ARCH}: Moving ISO images"
         mv "${x}/${ARCH}/iso/"* "isos/${ARCH}/"
+        echo "${x} ${ARCH}: Removing original ISO directory"
+        rmdir "${x}/${ARCH}/iso"
       done
       pushd "isos/${ARCH}" || { echo "${ARCH}: Failed to change directory"; break; }
-      # old deprecated way
-      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"
-      # new way
+      ## Should we also check for their existence before doing an ln?
       ln -s "Rocky-${REVISION}-${ARCH}-boot.iso" "Rocky-${MAJ}-latest-${ARCH}-boot.iso"
       ln -s "Rocky-${REVISION}-${ARCH}-dvd1.iso" "Rocky-${MAJ}-latest-${ARCH}-dvd.iso"
       ln -s "Rocky-${REVISION}-${ARCH}-minimal.iso" "Rocky-${MAJ}-latest-${ARCH}-minimal.iso"
@@ -48,13 +49,16 @@ for COMPOSE in "${NONSIG_COMPOSE[@]}"; do
           "$(sha256sum --tag ${file})" \
         | sudo tee -a "${file}.CHECKSUM"
       done
-      cat *.CHECKSUM > CHECKSUM
+      cat ./*.CHECKSUM > CHECKSUM
       popd || { echo "Could not change directory"; break; }
     done
-    rm -rf Minimal
-    mkdir -p live/x86_64
-    ln -s live Live
+    # Sort the cloud images here. Probably just a directory move, make some checksums (unless they're already there)
+    # Live images should probably be fine. Check anyway what we want to do. Might be a simple move.
   fi
+  # Delete the unnecessary dirs here.
+  for EMPTYDIR in "${NONREPO_DIRS[@]}"; do
+    rm -rf "${EMPTYDIR}"
+  done
   popd || { echo "${COMPOSE}: Failed to change directory"; break; }
 
   TARGET="${STAGING_ROOT}/${CATEGORY_STUB}/${REV}"
@@ -68,7 +72,6 @@ for COMPOSE in "${NONSIG_COMPOSE[@]}"; do
   popd || { echo "${COMPOSE}: Failed to change directory"; 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}" \
@@ -95,12 +98,15 @@ 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
+for ARCH in "${ARCHES[@]}"; do
+  for REPO in "${MODS_REPOS[@]}"; do
+    OS_TARGET="${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/${REPO}/${ARCH}/os/repodata/repomd.xml"
+    GOLD_TARGET="${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/${REPO}/${ARCH}/kickstart/repodata/repomd.xml"
+    echo "Signing ${REPO} ${ARCH}"
+    sign_data "${OS_TARGET}" "${MAJ}"
+    sign_data "${GOLD_TARGET}" "${MAJ}"
+  done
+done
 
 # Change Symlink if required
 echo "Setting symlink to ${REV}"

sync/sign-repos-only.sh

@@ -64,7 +64,7 @@ for x in "${ARCHES[@]}"; do
     fi
   done
 
-  echo "** Sign module repos"
+  echo "** Sign module repos if applicable"
   for y in "${MODS[@]}"; do
     test -d "${STAGING_ROOT}/${RELEASE_DIR}/${y}/${x}/os"
     ret_val=$?

sync/sync-to-staging.sh

@@ -12,8 +12,8 @@ if [[ $# -eq 0 ]]; then
   exit 1
 fi
 
-if [[ "${RLVER}" -ne "8" ]]; then
-  echo "This is only used for Rocky Linux 8 releases."
+if [[ "${RLVER}" -eq "8" ]]; then
+  echo "This is only used for Rocky Linux 8 and 10 releases."
 fi
 
 # Major Version (eg, 8)
@@ -101,7 +101,7 @@ if [ $ret_val -eq "0" ]; then
       done
     done
 
-    echo "** Updating modules"
+    echo "** Updating modules if applicable"
     for arch in "${ARCHES[@]}"; do
       for mod_repo in "${MODS[@]}"; do
         echo "Trying ${arch} ${mod_repo}..."