From b3ce1c52dc7ca455ffd94ea07d8a4fb1b6905fa8 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Mon, 20 May 2019 16:10:30 +0200
Subject: [PATCH] Move openSUSE Tumbleweed into a caching mirror instead

Tumbleweed is only rarely used in the openStack CI, so mirroring it
fully is not worth the time/space overhead. a caching proxy
should be good enough. Add it to the directories to clean up
and remove the older entries because they will no longer be
matching.

Change-Id: I987da098cf4a7330cdec8da9ae3cfbff2f330bf8
---
 .../files/mirror/opensuse-mirror-update.sh    | 35 ++-----------------
 .../templates/mirror.vhost.erb                |  4 +++
 .../roles/mirror/templates/mirror.vhost.j2    |  5 +++
 3 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/modules/openstack_project/files/mirror/opensuse-mirror-update.sh b/modules/openstack_project/files/mirror/opensuse-mirror-update.sh
index 08851136e8..21a88767ef 100644
--- a/modules/openstack_project/files/mirror/opensuse-mirror-update.sh
+++ b/modules/openstack_project/files/mirror/opensuse-mirror-update.sh
@@ -37,9 +37,10 @@ OBS_REPOS=('Virtualization:/containers/openSUSE_Leap_42.3'
 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 \
+for REPO in \
         distribution/leap/15.0/jeos distribution/leap/15.0/live \
-        repositories/Cloud:/OpenStack:/Master/openSUSE_Leap_42.3 ; do
+        repositories/Cloud:/OpenStack:/Master/openSUSE_Leap_42.3 \
+        tumbleweed update/tumbleweed ; do
     if [ -d $BASE/$REPO ]; then
         $K5START rm -rf $BASE/$REPO
     fi
@@ -90,36 +91,6 @@ for obs_repo in ${OBS_REPOS[@]}; do
         $OBS_MIRROR/$obs_repo/ $BASE/$REPO
 done
 
-REPO=tumbleweed
-if ! [ -f $BASE/$REPO ]; then
-    $K5START mkdir -p $BASE/$REPO/repo/oss/
-fi
-
-date --iso-8601=ns
-echo "Running rsync distribution $REPO ..."
-# TW is large and can have failures, be more resilient
-$K5START rsync -rlptDvz \
-    --delete --stats \
-    --delete-excluded \
-    --exclude="i586" \
-    --ignore-errors \
-    $MIRROR/$REPO/repo/oss/ $BASE/$REPO/repo/oss/ || :
-
-REPO=update/tumbleweed
-if ! [ -f $BASE/$REPO ]; then
-    $K5START mkdir -p $BASE/$REPO
-fi
-
-date --iso-8601=ns
-echo "Running rsync distribution $REPO ..."
-$K5START rsync -rlptDvz \
-    --timeout=600 \
-    --delete --stats \
-    --delete-excluded \
-    --exclude="i586" \
-    --ignore-errors \
-    $OBS_MIRROR/openSUSE:/Factory:/Update/standard/ $BASE/$REPO || :
-
 date --iso-8601=ns | $K5START tee $BASE/timestamp.txt
 echo "rsync completed successfully, running vos release."
 k5start -t -f /etc/afsadmin.keytab service/afsadmin -- vos release -v $MIRROR_VOLUME
diff --git a/modules/openstack_project/templates/mirror.vhost.erb b/modules/openstack_project/templates/mirror.vhost.erb
index 80f4acc03f..44d266f970 100644
--- a/modules/openstack_project/templates/mirror.vhost.erb
+++ b/modules/openstack_project/templates/mirror.vhost.erb
@@ -281,6 +281,10 @@ LogFormat "%h %l %u %t \"%r\" %>s %b %{cache-status}e \"%{Referer}i\" \"%{User-a
     ProxyPass "/copr-lxc2/" "https://copr-be.cloud.fedoraproject.org/results/thm/lxc2.0/" ttl=120 keepalive=On retry=0
     ProxyPassReverse "/copr-lxc2/" "https://copr-be.cloud.fedoraproject.org/results/thm/lxc2.0/"
 
+    # openSUSE Tumbleweed
+    CacheEnable disk "/tumbleweed"
+    ProxyPass "/tumbleweed/" "https://download.opensuse.org/tumbleweed/repo/oss/" ttl=120 keepalive=On retry=0
+    ProxyPassReverse "/tumbleweed/" "https://download.opensuse.org/tumbleweed/repo/oss/"
 </VirtualHost>
 
 # Docker registry v1 proxy.
diff --git a/playbooks/roles/mirror/templates/mirror.vhost.j2 b/playbooks/roles/mirror/templates/mirror.vhost.j2
index 68ce814309..7beab4646b 100644
--- a/playbooks/roles/mirror/templates/mirror.vhost.j2
+++ b/playbooks/roles/mirror/templates/mirror.vhost.j2
@@ -287,6 +287,11 @@ LogFormat "%h %l %u %t \"%r\" %>s %b %{cache-status}e \"%{Referer}i\" \"%{User-a
     ProxyPass "/copr-lxc2/" "https://copr-be.cloud.fedoraproject.org/results/thm/lxc2.0/" ttl=120 keepalive=On retry=0
     ProxyPassReverse "/copr-lxc2/" "https://copr-be.cloud.fedoraproject.org/results/thm/lxc2.0/"
 
+    # openSUSE Tumbleweed
+    CacheEnable disk "/tumbleweed"
+    ProxyPass "/tumbleweed/" "https://download.opensuse.org/tumbleweed/repo/oss/" ttl=120 keepalive=On retry=0
+    ProxyPassReverse "/tumbleweed/" "https://download.opensuse.org/tumbleweed/repo/oss/"
+
 </VirtualHost>
 
 # Docker registry v1 proxy.