From 813acedf84789a19a58bceb8f3c11ce831ac455f Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Wed, 13 Jul 2022 08:46:06 -0700 Subject: [PATCH] add additional file list operations for neil --- iso/empanadas/empanadas/configs/el8.yaml | 1 + iso/empanadas/empanadas/configs/el9-beta.yaml | 1 + iso/empanadas/empanadas/configs/el9.yaml | 1 + iso/empanadas/empanadas/configs/el9lh.yaml | 1 + sync/sync-to-prod-9.sh | 12 +++++++++++- sync/sync-to-prod.sh | 12 +++++++++++- 6 files changed, 26 insertions(+), 2 deletions(-) diff --git a/iso/empanadas/empanadas/configs/el8.yaml b/iso/empanadas/empanadas/configs/el8.yaml index eddf471..1ece4b1 100644 --- a/iso/empanadas/empanadas/configs/el8.yaml +++ b/iso/empanadas/empanadas/configs/el8.yaml @@ -62,6 +62,7 @@ isoskip: True repos: - 'minimal' + - 'BaseOS' variant: 'minimal' BaseOS: disc: False diff --git a/iso/empanadas/empanadas/configs/el9-beta.yaml b/iso/empanadas/empanadas/configs/el9-beta.yaml index 7eefd49..39719e1 100644 --- a/iso/empanadas/empanadas/configs/el9-beta.yaml +++ b/iso/empanadas/empanadas/configs/el9-beta.yaml @@ -50,6 +50,7 @@ isoskip: True repos: - 'minimal' + - 'BaseOS' variant: 'minimal' BaseOS: disc: False diff --git a/iso/empanadas/empanadas/configs/el9.yaml b/iso/empanadas/empanadas/configs/el9.yaml index 163c69a..6ab9ccc 100644 --- a/iso/empanadas/empanadas/configs/el9.yaml +++ b/iso/empanadas/empanadas/configs/el9.yaml @@ -50,6 +50,7 @@ isoskip: True repos: - 'minimal' + - 'BaseOS' variant: 'minimal' BaseOS: disc: False diff --git a/iso/empanadas/empanadas/configs/el9lh.yaml b/iso/empanadas/empanadas/configs/el9lh.yaml index 26c96cd..e817298 100644 --- a/iso/empanadas/empanadas/configs/el9lh.yaml +++ b/iso/empanadas/empanadas/configs/el9lh.yaml @@ -50,6 +50,7 @@ isoskip: True repos: - 'minimal' + - 'BaseOS' variant: 'minimal' BaseOS: disc: False diff --git a/sync/sync-to-prod-9.sh b/sync/sync-to-prod-9.sh index ab45c79..54accd4 100644 --- a/sync/sync-to-prod-9.sh +++ b/sync/sync-to-prod-9.sh @@ -15,7 +15,17 @@ if [ $ret_val -eq "0" ]; then mkdir -p "${TARGET}" sudo -l && time fpsync -o '-av --numeric-ids --no-compress --chown=10004:10005' -n 18 -t /mnt/compose/partitions "${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/" "${TARGET}/" - # Full file list update + # Full file list update for production root + cd "${PRODUCTION_ROOT}/" || echo { echo "Failed to change directory"; exit 1; } + find . > fullfilelist + if [[ -f /usr/local/bin/create-filelist ]]; then + # We're already here, but Justin Case wanted this + cd "${PRODUCTION_ROOT}/" || { 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 + # Full file list update for rocky linux itself cd "${PRODUCTION_ROOT}/${CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; } # Hardlink everything except xml files hardlink -x '.*\.xml.*' "${REVISION}" diff --git a/sync/sync-to-prod.sh b/sync/sync-to-prod.sh index b48b74c..63b0048 100644 --- a/sync/sync-to-prod.sh +++ b/sync/sync-to-prod.sh @@ -32,7 +32,17 @@ if [ $ret_val -eq "0" ]; then rsync -av --chown=10004:10005 --progress --relative --human-readable metadata "${TARGET}" fi - # Full file list update + # Full file list update for production root + cd "${PRODUCTION_ROOT}/" || echo { echo "Failed to change directory"; exit 1; } + find . > fullfilelist + if [[ -f /usr/local/bin/create-filelist ]]; then + # We're already here, but Justin Case wanted this + cd "${PRODUCTION_ROOT}/" || { 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 + # Full file list update for rocky linux itself cd "${PRODUCTION_ROOT}/${CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; } # Hardlink everything except xml files hardlink -x '.*\.xml.*' "${REVISION}"