From c4b40028f68f128cbe1d5c340d6fc7cf41af3c52 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 3 May 2019 12:18:24 +1000 Subject: [PATCH] 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 --- .../files/mirror/centos-mirror-update.sh | 9 ++++++++- .../openstack_project/files/mirror/epel-mirror-update.sh | 9 ++++++++- .../files/mirror/fedora-mirror-update.sh | 9 ++++++++- .../files/mirror/opensuse-mirror-update.sh | 9 ++++++++- .../files/mirror/yum-puppetlabs-mirror-update.sh | 9 ++++++++- 5 files changed, 40 insertions(+), 5 deletions(-) diff --git a/modules/openstack_project/files/mirror/centos-mirror-update.sh b/modules/openstack_project/files/mirror/centos-mirror-update.sh index 41a88ec153..647b96b612 100755 --- a/modules/openstack_project/files/mirror/centos-mirror-update.sh +++ b/modules/openstack_project/files/mirror/centos-mirror-update.sh @@ -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 diff --git a/modules/openstack_project/files/mirror/epel-mirror-update.sh b/modules/openstack_project/files/mirror/epel-mirror-update.sh index bac290c944..56690f1bbc 100755 --- a/modules/openstack_project/files/mirror/epel-mirror-update.sh +++ b/modules/openstack_project/files/mirror/epel-mirror-update.sh @@ -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 diff --git a/modules/openstack_project/files/mirror/fedora-mirror-update.sh b/modules/openstack_project/files/mirror/fedora-mirror-update.sh index 67a6b3d640..e0ebad6bc3 100644 --- a/modules/openstack_project/files/mirror/fedora-mirror-update.sh +++ b/modules/openstack_project/files/mirror/fedora-mirror-update.sh @@ -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 diff --git a/modules/openstack_project/files/mirror/opensuse-mirror-update.sh b/modules/openstack_project/files/mirror/opensuse-mirror-update.sh index 5100be8d1a..7f325929f1 100644 --- a/modules/openstack_project/files/mirror/opensuse-mirror-update.sh +++ b/modules/openstack_project/files/mirror/opensuse-mirror-update.sh @@ -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 \ diff --git a/modules/openstack_project/files/mirror/yum-puppetlabs-mirror-update.sh b/modules/openstack_project/files/mirror/yum-puppetlabs-mirror-update.sh index 4a832313b1..616e267bf0 100755 --- a/modules/openstack_project/files/mirror/yum-puppetlabs-mirror-update.sh +++ b/modules/openstack_project/files/mirror/yum-puppetlabs-mirror-update.sh @@ -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