Merge "mirror-update: make jobs interactive by default"

doc/source/afs.rst

@@ -528,7 +528,7 @@ our mirror update cron jobs, manually perform the first mirror update:
   ``timeout`` with shorter periods than may be required for the
   initial full sync.  e.g. for ``reprepro`` mirrors
 
-    NO_TIMEOUT=1 /usr/local/bin/reprepro-mirror-update /etc/reprepro/ubuntu mirror.ubuntu
+    /usr/local/bin/reprepro-mirror-update /etc/reprepro/ubuntu mirror.ubuntu
 
 * Log into ``afs01.dfw.openstack.org`` and run ``screen``.  Within
   that session, periodically during the sync, and once again after it

playbooks/roles/mirror-update/files/centos-mirror-update

@@ -17,11 +17,13 @@ source /usr/share/mirror-update/functions.sh
 
 MIRROR_VOLUME=$1
 
-if [[ ${NO_TIMEOUT:-0} -eq 1 ]]; then
-    echo "Running interactively"
+# Runs with timeout under cron
+if [[ ${UNDER_CRON:-0} -eq 0 ]]; then
+    echo_ts "Running interactively"
     TIMEOUT=""
+    set -x
 else
-    TIMEOUT="timeout -k 2m 30m"
+    TIMEOUT="timeout -k 2m 90m"
 fi
 
 _DRY_RUN=''

playbooks/roles/mirror-update/files/centos-stream-mirror-update

@@ -17,11 +17,13 @@ source /usr/share/mirror-update/functions.sh
 
 MIRROR_VOLUME=$1
 
-if [[ ${NO_TIMEOUT:-0} -eq 1 ]]; then
-    echo "Running interactively"
+# Runs with timeout under cron
+if [[ ${UNDER_CRON:-0} -eq 0 ]]; then
+    echo_ts "Running interactively"
     TIMEOUT=""
+    set -x
 else
-    TIMEOUT="timeout -k 2m 30m"
+    TIMEOUT="timeout -k 2m 90m"
 fi
 
 _DRY_RUN=''

playbooks/roles/mirror-update/files/epel-mirror-update

@@ -17,11 +17,13 @@ source /usr/share/mirror-update/functions.sh
 
 MIRROR_VOLUME=$1
 
-if [[ ${NO_TIMEOUT:-0} -eq 1 ]]; then
-    echo "Running interactively"
+# Runs with timeout under cron
+if [[ ${UNDER_CRON:-0} -eq 0 ]]; then
+    echo_ts "Running interactively"
     TIMEOUT=""
+    set -x
 else
-    TIMEOUT="timeout -k 2m 30m"
+    TIMEOUT="timeout -k 2m 90m"
 fi
 
 BASE="/afs/.openstack.org/mirror/epel"

playbooks/roles/mirror-update/files/fedora-mirror-update

@@ -17,12 +17,13 @@ source /usr/share/mirror-update/functions.sh
 
 MIRROR_VOLUME=$1
 
-if [[ ${NO_TIMEOUT:-0} -eq 1 ]]; then
+# Runs with timeout under cron
+if [[ ${UNDER_CRON:-0} -eq 0 ]]; then
     echo_ts "Running interactively"
-    set -x
     TIMEOUT=""
+    set -x
 else
-    TIMEOUT="timeout -k 2m 30m"
+    TIMEOUT="timeout -k 2m 90m"
 fi
 
 BASE="/afs/.openstack.org/mirror/fedora"

playbooks/roles/mirror-update/files/openeuler-mirror-update

@@ -20,11 +20,13 @@ source /usr/share/mirror-update/functions.sh
 
 MIRROR_VOLUME=$1
 
-if [[ ${NO_TIMEOUT:-0} -eq 1 ]]; then
+# Runs with timeout under cron
+if [[ ${UNDER_CRON:-0} -eq 0 ]]; then
     echo_ts "Running interactively"
     TIMEOUT=""
+    set -x
 else
-    TIMEOUT="timeout -k 2m 30m"
+    TIMEOUT="timeout -k 2m 90m"
 fi
 
 BASE="/afs/.openstack.org/mirror/openeuler"

playbooks/roles/mirror-update/files/opensuse-mirror-update

@@ -17,11 +17,13 @@ source /usr/share/mirror-update/functions.sh
 
 MIRROR_VOLUME=$1
 
-if [[ ${NO_TIMEOUT:-0} -eq 1 ]]; then
-    echo "Running interactively"
+# Runs with timeout under cron
+if [[ ${UNDER_CRON:-0} -eq 0 ]]; then
+    echo_ts "Running interactively"
     TIMEOUT=""
+    set -x
 else
-    TIMEOUT="timeout -k 2m 30m"
+    TIMEOUT="timeout -k 2m 90m"
 fi
 
 BASE="/afs/.openstack.org/mirror/opensuse"

playbooks/roles/mirror-update/files/yum-puppetlabs-mirror-update

@@ -17,11 +17,13 @@ source /usr/share/mirror-update/functions.sh
 
 MIRROR_VOLUME=$1
 
-if [[ ${NO_TIMEOUT:-0} -eq 1 ]]; then
-    echo "Running interactively"
+# Runs with timeout under cron
+if [[ ${UNDER_CRON:-0} -eq 0 ]]; then
+    echo_ts "Running interactively"
     TIMEOUT=""
+    set -x
 else
-    TIMEOUT="timeout -k 2m 30m"
+    TIMEOUT="timeout -k 2m 90m"
 fi
 
 BASE="/afs/.openstack.org/mirror/yum-puppetlabs"

playbooks/roles/reprepro/files/reprepro-mirror-update

@@ -16,9 +16,8 @@
 
 source /usr/share/mirror-update/functions.sh
 
-# For initial clones, and debugging, set this for more verbose output
-# that doesn't time out.
-if [[ ${NO_TIMEOUT:-0} -eq 1 ]]; then
+# Runs with timeout under cron
+if [[ ${UNDER_CRON:-0} -eq 0 ]]; then
     echo_ts "Running interactively"
     TIMEOUT=""
     set -x