adjust more vars

This commit is contained in:
Louis Abel 2023-01-13 15:27:21 -07:00
parent 05118b018c
commit 48edb52eed
Signed by: label
GPG Key ID: B37E62D143879B36
4 changed files with 6 additions and 6 deletions

View File

@ -29,7 +29,7 @@ PRODUCTION_ROOT="/mnt/repos-production"
# relative to ${ENV}_ROOT # relative to ${ENV}_ROOT
CATEGORY_STUB="mirror/pub/rocky" CATEGORY_STUB="mirror/pub/rocky"
RELEASE_DIR="${CATEGORY_STUB}/${REVISION}${APPEND_TO_DIR}" 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 # 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 # cases where repos will not be available by normal means. It's just for

View File

@ -8,11 +8,11 @@ case "${RLREL}" in
;; ;;
beta) beta)
REVISION=9.2 REVISION=9.2
APPEND_TO_DIR="-BETA" APPEND_TO_DIR="-beta"
;; ;;
lh) lh)
REVISION=9.2 REVISION=9.2
APPEND_TO_DIR="-LookAhead" APPEND_TO_DIR="-lookahead"
;; ;;
*) *)
echo "option no recognized" echo "option no recognized"
@ -28,7 +28,7 @@ PRODUCTION_ROOT="/mnt/repos-production"
# relative to ${ENV}_ROOT # relative to ${ENV}_ROOT
CATEGORY_STUB="mirror/pub/rocky" CATEGORY_STUB="mirror/pub/rocky"
RELEASE_DIR="${CATEGORY_STUB}/${REVISION}${APPEND_TO_DIR}" 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 # 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 # cases where repos will not be available by normal means. It's just for

View File

@ -14,7 +14,7 @@ MAJ=${RLVER}
# Short name (eg, NFV, extras, Rocky, gluster9) # Short name (eg, NFV, extras, Rocky, gluster9)
SHORT=${1} 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=$? ret_val=$?
if [ $ret_val -eq "0" ]; then if [ $ret_val -eq "0" ]; then

View File

@ -14,7 +14,7 @@ MAJ=${RLVER}
# Short name (eg, NFV, extras, Rocky, gluster9) # Short name (eg, NFV, extras, Rocky, gluster9)
SHORT=${1} 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=$? ret_val=$?
if [ $ret_val -eq "0" ]; then if [ $ret_val -eq "0" ]; then