Merge branch 'devel' into 'main'

Devel

See merge request release-engineering/public/toolkit!39

sync/common_8

@@ -116,8 +116,8 @@ EOF
 
 function treeinfoModderKickstart() {
   BaseOSArch="${1}"
-  TREEINFO_VAR="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo"
+  TREEINFO_VAR="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/kickstart/.treeinfo"
-  PRISTINE_TREE="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo-pristine"
+  PRISTINE_TREE="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/kickstart/.treeinfo-pristine"
   test -f "${TREEINFO_VAR}"
   treeinfo_retval=$?
   test -x /usr/bin/python3

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

@@ -60,16 +60,16 @@ for ARCH in "${ARCHES[@]}"; do
     cp "${SOURCE}"/*.iso "${TARGET}/"
     cp "${SOURCE}"/*.iso.manifest "${TARGET}/"
     pushd "${TARGET}" || { echo "Could not change directory"; break; }
-    # shellcheck disable=SC2086
-    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
+  # shellcheck disable=SC2086
+  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
 
 # make a kickstart directory

sync/sync-to-prod.sh

@@ -29,7 +29,8 @@ if [ $ret_val -eq "0" ]; then
     cd "${PRODUCTION_ROOT}/${CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; }
     /bin/cp fullfiletimelist-rocky fullfiletimelist-rocky-old
     /usr/local/bin/create-filelist > fullfiletimelist-rocky
+    cp fullfiletimelist-rocky fullfiletimelist
   fi
-  chown 10004:10005 fullfilelist fullfiletimelist-rocky
+  chown 10004:10005 fullfilelist fullfiletimelist-rocky fullfiletimelist
 fi