Merge branch 'devel' into 'main'

fixes for ISO placement and other stuff

See merge request release-engineering/public/toolkit!31
This commit is contained in:
Louis Abel 2021-11-10 23:23:32 +00:00
commit d5bf886933
2 changed files with 6 additions and 3 deletions

View File

@ -48,6 +48,7 @@ NONSIG_COMPOSE=(
Extras
Plus
NFV
rockyrpi
)
declare -A SIG_COMPOSE

View File

@ -49,10 +49,12 @@ for ARCH in "${ARCHES[@]}"; do
TARGET_ARCH="${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/${x}/${ARCH}/iso"
mkdir -p "${SOURCE}" "${TARGET}" "${TARGET_ARCH}"
# Copy the ISO and manifests into their target architecture
cp "${SOURCE}/*.iso*" "${TARGET_ARCH}/"
cp "${SOURCE}/CHECKSUM" "${TARGET_ARCH}/"
cp -n "${SOURCE}"/*.iso "${TARGET_ARCH}/"
cp -n "${SOURCE}"/*.iso.manifest "${TARGET_ARCH}/"
cp -n "${SOURCE}/CHECKSUM" "${TARGET_ARCH}/"
# Copy the ISO and manifests into the main isos target
cp "${SOURCE}/*.iso*" "${TARGET}/"
cp "${SOURCE}"/*.iso "${TARGET}/"
cp "${SOURCE}"/*.iso.manifest "${TARGET}/"
cat "${SOURCE}/CHECKSUM" >> "${TARGET}/CHECKSUM"
done
done