From e4018d11d7f8f514c48397b40d423c48187e0044 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Mon, 25 Jul 2022 18:03:07 -0700 Subject: [PATCH] add sig syncs --- .../empanadas/templates/reposync.tmpl | 2 +- sync/sync-to-prod-sig.sh | 29 +++++++++++++++++++ sync/sync-to-staging-sig.sh | 4 +-- 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 sync/sync-to-prod-sig.sh diff --git a/iso/empanadas/empanadas/templates/reposync.tmpl b/iso/empanadas/empanadas/templates/reposync.tmpl index 089c5f8..c0092db 100644 --- a/iso/empanadas/empanadas/templates/reposync.tmpl +++ b/iso/empanadas/empanadas/templates/reposync.tmpl @@ -26,7 +26,7 @@ if [ "$ret_val" -eq 0 ]; then # echo "Repository is empty." | tee -a {{ sync_log }} # rm -rf {{ download_path }} #fi -{% if deploy_extra_files %} +{%- if deploy_extra_files %} pushd {{ download_path }} curl -RO {{ gpg_key_url }} popd diff --git a/sync/sync-to-prod-sig.sh b/sync/sync-to-prod-sig.sh new file mode 100644 index 0000000..35bdbe8 --- /dev/null +++ b/sync/sync-to-prod-sig.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +# Source common variables +# shellcheck disable=SC2046,1091,1090 +source "$(dirname "$0")/common" + +#if [[ $# -eq 0 ]] || [[ $# -eq 1 ]]; then +# echo "Not enough information." +# echo "You must use: shortname sig" +# exit 1 +#fi + +cd "${STAGING_ROOT}/${SIG_CATEGORY_STUB}/${MAJOR}" || { echo "Failed to change directory"; ret_val=1; exit 1; } +ret_val=$? + +if [ $ret_val -eq "0" ]; then + TARGET=${PRODUCTION_ROOT}/${SIG_CATEGORY_STUB}/${MAJOR}/ + 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}" + + cd "${PRODUCTION_ROOT}/${SIG_CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; } + echo "Hard linking" + hardlink -x '.*\.xml.*' "${MAJOR}" + echo "Syncing to prod completed. Please run the file list script." +fi diff --git a/sync/sync-to-staging-sig.sh b/sync/sync-to-staging-sig.sh index 0be3bcc..2005d89 100644 --- a/sync/sync-to-staging-sig.sh +++ b/sync/sync-to-staging-sig.sh @@ -17,11 +17,11 @@ SHORT=${1} # Note, this should be lowercase. eg, storage. SIG=${2} -cd "/mnt/compose/${MAJ}/latest-${SHORT}-${MAJ}/compose" || { echo "Failed to change directory"; ret_val=1; exit 1; } +cd "/mnt/compose/${MAJ}/latest-SIG-${SHORT}-${MAJ}/compose" || { echo "Failed to change directory"; ret_val=1; exit 1; } ret_val=$? if [ $ret_val -eq "0" ]; then - TARGET=${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/${SIG} + TARGET=${STAGING_ROOT}/${SIG_CATEGORY_STUB}/ mkdir -p "${TARGET}" # disabling because none of our files should be starting with dashes. If they # are something is *seriously* wrong here.