Merge branch 'devel' of ssh://git.rockylinux.org:22220/release-engineering/public/toolkit into devel

This commit is contained in:
Louis Abel 2021-07-06 13:16:14 -07:00
commit bea96cdb71
Signed by: label
GPG Key ID: 6735C0E1BD65D048

View File

@ -22,11 +22,14 @@ cleanup_repo () {
# plus is actually 'rockyplus'. Others may as well(?) # plus is actually 'rockyplus'. Others may as well(?)
if [[ "${repo}" =~ ^(plus)$ ]]; then if [[ "${repo}" =~ ^(plus)$ ]]; then
repo="rocky${repo}" repo="rocky${repo}"
# nfv is actually 'NFV'
elif [[ "${repo}" =~ ^(nfv)$ ]]; then elif [[ "${repo}" =~ ^(nfv)$ ]]; then
repo="${repo^^}" repo="${repo^^}"
else
repo="${repo}"
fi fi
# Everything has an 8 appended to it
repo="${repo}-8"
return 0 return 0
} }
@ -38,17 +41,18 @@ for repo in "${ALL_REPOS[@]}"; do
# Print a nice header # Print a nice header
printf "================\n${repo}\n================\n" printf "================\n${repo}\n================\n"
for arch in "${ARCHES[@]}" "source"; do for arch in "${ARCHES[@]}" "source"; do
# Source is treated as its own architecture
if [[ "${arch}" == "source" ]]; then if [[ "${arch}" == "source" ]]; then
_repo="${repo}-8-source" repo="${repo}-source"
else
_repo="${repo}-8"
fi fi
result=$(curl -s "${MIRRORLIST_BASE}?repo=${_repo}&arch=${arch}&time&country=global") # Get the normal repo/arch combinations
result=$(curl -s "${MIRRORLIST_BASE}?repo=${repo}&arch=${arch}&time&country=global")
print_result print_result
# x86 and a64 have 'debug' types, as well
if [[ "${arch}" =~ ^(x86_|aarch)64$ ]]; then if [[ "${arch}" =~ ^(x86_|aarch)64$ ]]; then
result=$(curl -s "${MIRRORLIST_BASE}?repo=${_repo}-debug&arch=${arch}&time&country=global") result=$(curl -s "${MIRRORLIST_BASE}?repo=${repo}-debug&arch=${arch}&time&country=global")
print_result print_result
fi fi
done done