Commit 18094444 authored by Louis Abel's avatar Louis Abel 📺
Browse files

Merge branch 'devel' into 'main'

expand use

See merge request !8
parents 73f6b473 3cd78ce3
Pipeline #30 passed with stage
in 30 seconds
# To be sourced by scripts to use # To be sourced by scripts to use
# Revision must always start with a major number # Temporary probably. This makes it so if RLVER=... is called before the script
REVISION=8.4 # it will set the version for the variables to call up. This was easier than
# creating duplicates of a bunch of stuff. Default version is 8.
MAJOR="${REVISION:0:1}" if [ -z "$RLVER" ]; then
MINOR="${REVISION:2:1}" export RLVER=8
fi
# comment or blank if needed
APPEND_TO_DIR="-RC2"
STAGING_ROOT="/mnt/repos-staging" STAGING_ROOT="/mnt/repos-staging"
PRODUCTION_ROOT="/mnt/repos-production" 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}"
# should be overriden in other commons
#RELEASE_DIR="${CATEGORY_STUB}/${REVISION}${APPEND_TO_DIR}"
# Define arches we support # Define arches we support
ARCHES=(x86_64 aarch64) ARCHES=(x86_64 aarch64)
# Set all repos that have no comps/groups associated with them. This is even in #Source Major common
# cases where repos will not be available by normal means. It's just for test -f "$(dirname "$0")/common_${RLVER}" && source "$(dirname "$0")/common_${RLVER}"
# consistency. if [ "$?" -ne 0 ]; then
NONMODS_REPOS=( echo "Could not source common_${RLVER}"
extras exit 1
Devel fi
nfv
storage/gluster9
plus
)
# These repos have comps/groups, except for debuginfo and sources
MODS_REPOS=(
BaseOS
AppStream
HighAvailability
ResilientStorage
PowerTools
)
ALL_REPOS=(
"${NONMODS_REPOS[@]}"
"${MODS_REPOS[@]}"
)
# These repos have modules # Combined variables based on common data
MODS=( REV="${REVISION}${APPEND_TO_DIR}"
AppStream
PowerTools
)
# To be sourced by scripts to use
# Revision must always start with a major number
REVISION=8.4
MAJOR="${REVISION:0:1}"
MINOR="${REVISION:2:1}"
# comment or blank if needed
APPEND_TO_DIR="-RC2"
STAGING_ROOT="/mnt/repos-staging"
PRODUCTION_ROOT="/mnt/repos-production"
# relative to ${ENV}_ROOT
CATEGORY_STUB="mirror/pub/rocky"
RELEASE_DIR="${CATEGORY_STUB}/${REVISION}${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
# consistency.
NONMODS_REPOS=(
extras
Devel
nfv
storage/gluster9
plus
)
# These repos have comps/groups, except for debuginfo and sources
MODS_REPOS=(
BaseOS
AppStream
HighAvailability
ResilientStorage
PowerTools
)
ALL_REPOS=(
"${NONMODS_REPOS[@]}"
"${MODS_REPOS[@]}"
)
# These repos have modules
MODS=(
AppStream
PowerTools
)
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
# Compose dir example: /mnt/repos-staging/mirror/pub/rocky/8.4-RC2 # Compose dir example: /mnt/repos-staging/mirror/pub/rocky/8.4-RC2
# Source common variables # Source common variables
export RLVER=8
# shellcheck disable=SC2046,1091,1090 # shellcheck disable=SC2046,1091,1090
source "$(dirname "$0")/common" source "$(dirname "$0")/common"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# shellcheck disable=SC2046,1091,1090 # shellcheck disable=SC2046,1091,1090
source "$(dirname "$0")/common" source "$(dirname "$0")/common"
REV=${1} REV=${REVISION}${APPEND_TO_DIR}
cd "${STAGING_ROOT}/${CATEGORY_STUB}/${REV}" || { echo "Failed to change directory"; ret_val=1; exit 1; } cd "${STAGING_ROOT}/${CATEGORY_STUB}/${REV}" || { echo "Failed to change directory"; ret_val=1; exit 1; }
ret_val=$? ret_val=$?
......
...@@ -4,14 +4,18 @@ ...@@ -4,14 +4,18 @@
# shellcheck disable=SC2046,1091,1090 # shellcheck disable=SC2046,1091,1090
source "$(dirname "$0")/common" source "$(dirname "$0")/common"
if [[ $# -eq 0 ]] || [[ $# -eq 1 ]]; then
echo "Not enough information."
echo "You must use: shortname sig"
exit 1
fi
# Major Version (eg, 8) # Major Version (eg, 8)
MAJ=${1} MAJ=${RLVER}
# Short name (eg, NFV, extras, Rocky, gluster9) # Short name (eg, NFV, extras, Rocky, gluster9)
SHORT=${2} SHORT=${1}
# The directory where we're going to, usually MAJOR.MINOR, sometimes it's MAJOR.MINOR-RCX
REV=${3}
# Note, this should be lowercase. eg, storage. # Note, this should be lowercase. eg, storage.
SIG=${4} 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-${SHORT}-${MAJ}/compose" || { echo "Failed to change directory"; ret_val=1; exit 1; }
ret_val=$? ret_val=$?
......
...@@ -4,12 +4,15 @@ ...@@ -4,12 +4,15 @@
# shellcheck disable=SC2046,1091,1090 # shellcheck disable=SC2046,1091,1090
source "$(dirname "$0")/common" source "$(dirname "$0")/common"
if [[ $# -eq 0 ]]; then
echo "You must specify a short name."
exit 1
fi
# Major Version (eg, 8) # Major Version (eg, 8)
MAJ=${1} MAJ=${RLVER}
# Short name (eg, NFV, extras, Rocky, gluster9) # Short name (eg, NFV, extras, Rocky, gluster9)
SHORT=${2} SHORT=${1}
# The directory where we're going to, usually MAJOR.MINOR, sometimes it's MAJOR.MINOR-RCX
REV=${3}
cd "/mnt/compose/${MAJ}/latest-${SHORT}-${MAJ}/compose" || { echo "Failed to change directory"; ret_val=1; exit 1; } cd "/mnt/compose/${MAJ}/latest-${SHORT}-${MAJ}/compose" || { echo "Failed to change directory"; ret_val=1; exit 1; }
ret_val=$? ret_val=$?
......
#!/bin/bash
# tests that the variables work
# shellcheck disable=SC1090
source "$(dirname "$0")/common"
echo "${RELEASE_DIR}"
echo "${STAGING_ROOT}/${CATEGORY_STUB}/${REV}"
echo "$NONMODS_REPOS"
echo "${REV}"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment