opendev
/
system-config
Code Issues Proposed changes

Add NO_TIMEOUT for mirror update scripts 

In I239bc1a0b5928673b42cc67291bb519d5f5d2471 we added NO_TIMEOUT as a
variable to reprepro for running when you know the timeout might get
hit (initial syncs, etc).

Add the same variable to the other mirror scripts for consistency.

Change-Id: Id34010058bd18107caee909f877fa817cf16428b
This commit is contained in:
Ian Wienand 2019-05-03 12:18:24 +10:00
parent fa0f5860d2
commit c4b40028f6
5 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/openstack_project/files/mirror/centos-mirror-update.sh
View File

@ -15,9 +15,16 @@
MIRROR_VOLUME=$1
if [[ ${NO_TIMEOUT:-0} -eq 1 ]]; then
echo "Running interactively"
TIMEOUT=""
else
TIMEOUT="timeout -k 2m 30m"
fi
BASE="/afs/.openstack.org/mirror/centos"
MIRROR="rsync://mirror.lstn.net"
K5START="k5start -t -f /etc/centos.keytab service/centos-mirror -- timeout -k 2m 30m"
K5START="k5start -t -f /etc/centos.keytab service/centos-mirror -- $TIMEOUT"
REPO=7
if ! [ -f $BASE/$REPO ]; then

9
modules/openstack_project/files/mirror/epel-mirror-update.sh
View File

@ -15,12 +15,19 @@
MIRROR_VOLUME=$1
if [[ ${NO_TIMEOUT:-0} -eq 1 ]]; then
echo "Running interactively"
TIMEOUT=""
else
TIMEOUT="timeout -k 2m 30m"
fi
BASE="/afs/.openstack.org/mirror/epel"
# NOTE(pabelanger): #fedora-admin:
# tibbs | I run pubmirror[12].math.uh.edu.
# tibbs | It polls the masters every ten minutes.
MIRROR="rsync://pubmirror1.math.uh.edu/fedora-buffet/epel"
K5START="k5start -t -f /etc/epel.keytab service/epel-mirror -- timeout -k 2m 30m"
K5START="k5start -t -f /etc/epel.keytab service/epel-mirror -- $TIMEOUT"
REPO=7
if ! [ -f $BASE/$REPO ]; then

9
modules/openstack_project/files/mirror/fedora-mirror-update.sh
View File

@ -15,6 +15,13 @@
MIRROR_VOLUME=$1
if [[ ${NO_TIMEOUT:-0} -eq 1 ]]; then
echo "Running interactively"
TIMEOUT=""
else
TIMEOUT="timeout -k 2m 30m"
fi
BASE="/afs/.openstack.org/mirror/fedora"
# NOTE(pabelanger): #fedora-admin:
# tibbs | I run pubmirror[12].math.uh.edu.
@ -24,7 +31,7 @@ BASE="/afs/.openstack.org/mirror/fedora"
# which you have to have admin permissions in AFS to set.
# https://pagure.io/releng/issue/7921
MIRROR="rsync://pubmirror1.math.uh.edu/fedora-buffet/fedora/linux"
K5START="k5start -t -f /etc/fedora.keytab service/fedora-mirror -- timeout -k 2m 30m"
K5START="k5start -t -f /etc/fedora.keytab service/fedora-mirror -- ${TIMEOUT}"
for REPO in releases/28 releases/29; do
if ! [ -f $BASE/$REPO ]; then

9
modules/openstack_project/files/mirror/opensuse-mirror-update.sh
View File

@ -15,6 +15,13 @@
MIRROR_VOLUME=$1
if [[ ${NO_TIMEOUT:-0} -eq 1 ]]; then
echo "Running interactively"
TIMEOUT=""
else
TIMEOUT="timeout -k 2m 30m"
fi
BASE="/afs/.openstack.org/mirror/opensuse"
MIRROR="rsync://mirror.us.leaseweb.net/opensuse"
OBS_MIRROR="rsync://provo-mirror.opensuse.org/opensuse/repositories"
@ -24,7 +31,7 @@ CLOUD_OBS_REPOS=('Cloud:/OpenStack:/Queens/openSUSE_Leap_42.3'
'Cloud:/OpenStack:/Rocky/openSUSE_Leap_42.3'
'Cloud:/OpenStack:/Rocky/openSUSE_Leap_15.0'
'Cloud:/OpenStack:/Master/openSUSE_Leap_15.0')
K5START="k5start -t -f /etc/opensuse.keytab service/opensuse-mirror -- timeout -k 2m 30m"
K5START="k5start -t -f /etc/opensuse.keytab service/opensuse-mirror -- $TIMEOUT"
# NOTE(hwoarang): Ensure old distros are not mirrored aymore
for REPO in distribution/leap/42.2 update/leap/42.2 \

9
modules/openstack_project/files/mirror/yum-puppetlabs-mirror-update.sh
View File

@ -15,9 +15,16 @@
MIRROR_VOLUME=$1
if [[ ${NO_TIMEOUT:-0} -eq 1 ]]; then
echo "Running interactively"
TIMEOUT=""
else
TIMEOUT="timeout -k 2m 30m"
fi
BASE="/afs/.openstack.org/mirror/yum-puppetlabs"
MIRROR="rsync://rsync.puppet.com/packages"
K5START="k5start -t -f /etc/yum-puppetlabs.keytab service/yum-puppetlabs-mirror -- timeout -k 2m 30m"
K5START="k5start -t -f /etc/yum-puppetlabs.keytab service/yum-puppetlabs-mirror -- $TIMEOUT"
if ! [ -f $BASE ]; then
$K5START mkdir -p $BASE