From 48edb52eed19a97d9ece6f2aad4eb2aaae617e9e Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Fri, 13 Jan 2023 15:27:21 -0700 Subject: [PATCH] adjust more vars --- sync/common_8 | 2 +- sync/common_9 | 6 +++--- sync/sync-to-staging.delete.sh | 2 +- sync/sync-to-staging.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sync/common_8 b/sync/common_8 index 8b5bc89..6244bf6 100644 --- a/sync/common_8 +++ b/sync/common_8 @@ -29,7 +29,7 @@ PRODUCTION_ROOT="/mnt/repos-production" # relative to ${ENV}_ROOT CATEGORY_STUB="mirror/pub/rocky" RELEASE_DIR="${CATEGORY_STUB}/${REVISION}${APPEND_TO_DIR}" -RELEASE_COMPOSE_ROOT="${COMPOSE_ROOT}/${MAJOR}${COMPOSE_APPEND}" +RELEASE_COMPOSE_ROOT="${COMPOSE_ROOT}/${MAJOR}${COMPOSE_APPEND}/latest-${SHORT}-${MAJ}" # Set all repos that have no comps/groups associated with them. This is even in # cases where repos will not be available by normal means. It's just for diff --git a/sync/common_9 b/sync/common_9 index 89e720f..79eb50e 100644 --- a/sync/common_9 +++ b/sync/common_9 @@ -8,11 +8,11 @@ case "${RLREL}" in ;; beta) REVISION=9.2 - APPEND_TO_DIR="-BETA" + APPEND_TO_DIR="-beta" ;; lh) REVISION=9.2 - APPEND_TO_DIR="-LookAhead" + APPEND_TO_DIR="-lookahead" ;; *) echo "option no recognized" @@ -28,7 +28,7 @@ PRODUCTION_ROOT="/mnt/repos-production" # relative to ${ENV}_ROOT CATEGORY_STUB="mirror/pub/rocky" RELEASE_DIR="${CATEGORY_STUB}/${REVISION}${APPEND_TO_DIR}" -RELEASE_COMPOSE_ROOT="${COMPOSE_ROOT}/${MAJOR}" +RELEASE_COMPOSE_ROOT="${COMPOSE_ROOT}/${MAJOR}/latest-${SHORT}-${MAJ}${APPEND_TO_DIR}" # Set all repos that have no comps/groups associated with them. This is even in # cases where repos will not be available by normal means. It's just for diff --git a/sync/sync-to-staging.delete.sh b/sync/sync-to-staging.delete.sh index 31bae76..b1b8f97 100644 --- a/sync/sync-to-staging.delete.sh +++ b/sync/sync-to-staging.delete.sh @@ -14,7 +14,7 @@ MAJ=${RLVER} # Short name (eg, NFV, extras, Rocky, gluster9) SHORT=${1} -cd "${RELEASE_COMPOSE_ROOT}/latest-${SHORT}-${MAJ}/compose" || { echo "Failed to change directory"; ret_val=1; exit 1; } +cd "${RELEASE_COMPOSE_ROOT}/compose" || { echo "Failed to change directory"; ret_val=1; exit 1; } ret_val=$? if [ $ret_val -eq "0" ]; then diff --git a/sync/sync-to-staging.sh b/sync/sync-to-staging.sh index 4ac606d..969bb24 100644 --- a/sync/sync-to-staging.sh +++ b/sync/sync-to-staging.sh @@ -14,7 +14,7 @@ MAJ=${RLVER} # Short name (eg, NFV, extras, Rocky, gluster9) SHORT=${1} -cd "${RELEASE_COMPOSE_ROOT}/latest-${SHORT}-${MAJ}/compose" || { echo "Failed to change directory"; ret_val=1; exit 1; } +cd "${RELEASE_COMPOSE_ROOT}/compose" || { echo "Failed to change directory"; ret_val=1; exit 1; } ret_val=$? if [ $ret_val -eq "0" ]; then