Commit 8bc836c9 authored by Neil Hanlon's avatar Neil Hanlon
Browse files

Merge branch 'devel' into 'main'

merge to main

See merge request !3
parents e47d87a0 9a77fb5d
Pipeline #16 failed with stage
in 30 seconds
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
r_log "network" "Test bridging functionality (non-network manager)" r_log "network" "Test bridging functionality (non-network manager)"
bridge=dummybr0 bridge=dummybr0
# shellcheck disable=SC1091 # shellcheck disable=SC1091,1090
. "$(dirname "$0")"/imports.sh . "$(dirname "$0")"/imports.sh
r_log "network" "Add a dummy bridge $bridge" r_log "network" "Add a dummy bridge $bridge"
......
#!/usr/bin/env bash #!/usr/bin/env bash
# Source mangle vars # Source mangle vars
source $(dirname "$0")/common source "$(dirname "$0")/common"
# Source sync / migrate vars for repository information # Source sync / migrate vars for repository information
source $(dirname "$0")/../sync/common source "$(dirname "$0")/../sync/common"
# How many # How many
ARG1=${1} ARG1=${1}
...@@ -11,7 +11,7 @@ NUM=$(( ${ARG1:-${MIRROR_DISPLAY_COUNT}} + 2)) ...@@ -11,7 +11,7 @@ NUM=$(( ${ARG1:-${MIRROR_DISPLAY_COUNT}} + 2))
print_result () { print_result () {
if [[ "${result}" =~ "invalid repo or arch" ]]; then if [[ "${result}" =~ "invalid repo or arch" ]]; then
printf "# repo = %s arch = %s\n" "${_repo}" "${arch}" printf "# repo = %s arch = %s\n" "${repo}" "${arch}"
printf "# FAIL: invalid repo or arch\n\n" printf "# FAIL: invalid repo or arch\n\n"
else else
printf "%s\n# number of mirrors returned: %s\n\n" "$( echo "$result" | head -${NUM})" "$(( $(echo "$result" | wc -l) - 2 ))" printf "%s\n# number of mirrors returned: %s\n\n" "$( echo "$result" | head -${NUM})" "$(( $(echo "$result" | wc -l) - 2 ))"
...@@ -39,7 +39,7 @@ for repo in "${ALL_REPOS[@]}"; do ...@@ -39,7 +39,7 @@ for repo in "${ALL_REPOS[@]}"; do
cleanup_repo "${repo}" cleanup_repo "${repo}"
# Print a nice header # Print a nice header
printf "================\n${repo}\n================\n" printf "================\n%s\n================\n" "${repo}"
for arch in "${ARCHES[@]}" "source"; do for arch in "${ARCHES[@]}" "source"; do
# Source is treated as its own architecture # Source is treated as its own architecture
if [[ "${arch}" == "source" ]]; then if [[ "${arch}" == "source" ]]; then
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Performs a full on sync of a minor release, directories and all. It calls the # Performs a full on sync of a minor release, directories and all. It calls the
# other scripts in this directory to assist. # other scripts in this directory to assist.
# Source common variables # Source common variables
# shellcheck disable=SC2046,1091 # shellcheck disable=SC2046,1091,1090
source $(dirname "$0")/common source $(dirname "$0")/common
# sync all pieces of a release, including extras, nfv, etc # sync all pieces of a release, including extras, nfv, etc
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
# 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
# shellcheck disable=SC2046,1091 # shellcheck disable=SC2046,1091,1090
source $(dirname "$0")/common source "$(dirname "$0")/common"
echo "** Updating source repos" echo "** Updating source repos"
for y in "${ALL_REPOS[@]}"; do for y in "${ALL_REPOS[@]}"; do
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
# Syncs everything from staging to production # Syncs everything from staging to production
# Source common variables # Source common variables
# shellcheck disable=SC2046,1091 # shellcheck disable=SC2046,1091,1090
source $(dirname "$0")/common source "$(dirname "$0")/common"
REV=${1} REV=${1}
...@@ -13,6 +13,9 @@ ret_val=$? ...@@ -13,6 +13,9 @@ ret_val=$?
if [ $ret_val -eq "0" ]; then if [ $ret_val -eq "0" ]; then
TARGET="${PRODUCTION_ROOT}/${CATEGORY_STUB}/${REV:0:3}" TARGET="${PRODUCTION_ROOT}/${CATEGORY_STUB}/${REV:0:3}"
mkdir -p "${TARGET}" 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 \ sudo -l && find **/* -maxdepth 0 -type d | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable \
{} "${TARGET}" {} "${TARGET}"
fi fi
#!/bin/bash #!/bin/bash
# Source common variables # Source common variables
# shellcheck disable=SC2046,1091 # shellcheck disable=SC2046,1091,1090
source $(dirname "$0")/common source "$(dirname "$0")/common"
# Major Version (eg, 8) # Major Version (eg, 8)
MAJ=${1} MAJ=${1}
...@@ -19,6 +19,9 @@ ret_val=$? ...@@ -19,6 +19,9 @@ ret_val=$?
if [ $ret_val -eq "0" ]; then if [ $ret_val -eq "0" ]; then
TARGET=${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/${SIG} TARGET=${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/${SIG}
mkdir -p "${TARGET}" 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 \ sudo -l && find **/* -maxdepth 0 -type d | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable \
{} "${TARGET}" {} "${TARGET}"
fi fi
#!/bin/bash #!/bin/bash
# Source common variables # Source common variables
# shellcheck disable=SC2046,1091 # shellcheck disable=SC2046,1091,1090
source $(dirname "$0")/common source "$(dirname "$0")/common"
# Major Version (eg, 8) # Major Version (eg, 8)
MAJ=${1} MAJ=${1}
...@@ -17,6 +17,9 @@ ret_val=$? ...@@ -17,6 +17,9 @@ ret_val=$?
if [ $ret_val -eq "0" ]; then if [ $ret_val -eq "0" ]; then
TARGET="${STAGING_ROOT}/${CATEGORY_STUB}/${REV}" TARGET="${STAGING_ROOT}/${CATEGORY_STUB}/${REV}"
mkdir -p "${TARGET}" 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 \ sudo -l && find **/* -maxdepth 0 -type d | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable \
{} "${TARGET}" {} "${TARGET}"
fi fi
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