From c43cb4a78f67f5f5745de00b814a21b7a892dd10 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Fri, 26 Apr 2019 13:17:09 +0200
Subject: [PATCH] Properly mirror the lxc container images as well

There is convoluted code in openstack ansible CI to
fetch the file from the official mirror, which is frowned
upon for CI reliability purposes. so we have to mirror
it into AFS.

Change-Id: I84c43f8d4eb0d0ae5ca81c4f8620058a3ecc46fe
---
 .../files/mirror/opensuse-mirror-update.sh    | 34 ++++++-------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/modules/openstack_project/files/mirror/opensuse-mirror-update.sh b/modules/openstack_project/files/mirror/opensuse-mirror-update.sh
index 34b0083fcc..08851136e8 100644
--- a/modules/openstack_project/files/mirror/opensuse-mirror-update.sh
+++ b/modules/openstack_project/files/mirror/opensuse-mirror-update.sh
@@ -25,13 +25,15 @@ fi
 BASE="/afs/.openstack.org/mirror/opensuse"
 MIRROR="rsync://mirror.us.leaseweb.net/opensuse"
 OBS_MIRROR="rsync://provo-mirror.opensuse.org/opensuse/repositories"
-OBS_REPOS=('Virtualization:/containers')
-CLOUD_OBS_REPOS=('Cloud:/OpenStack:/Queens/openSUSE_Leap_42.3'
-                'Cloud:/OpenStack:/Queens/openSUSE_Leap_15.0'
-                'Cloud:/OpenStack:/Rocky/openSUSE_Leap_42.3'
-                'Cloud:/OpenStack:/Rocky/openSUSE_Leap_15.0'
-                'Cloud:/OpenStack:/Stein/openSUSE_Leap_15.0'
-                'Cloud:/OpenStack:/Master/openSUSE_Leap_15.0')
+OBS_REPOS=('Virtualization:/containers/openSUSE_Leap_42.3'
+            'Virtualization:/containers/openSUSE_Leap_15.0'
+            'Virtualization:/containers:/images:/openSUSE-Leap-15.0'
+            'Cloud:/OpenStack:/Queens/openSUSE_Leap_42.3'
+            'Cloud:/OpenStack:/Queens/openSUSE_Leap_15.0'
+            'Cloud:/OpenStack:/Rocky/openSUSE_Leap_42.3'
+            'Cloud:/OpenStack:/Rocky/openSUSE_Leap_15.0'
+            'Cloud:/OpenStack:/Stein/openSUSE_Leap_15.0'
+            'Cloud:/OpenStack:/Master/openSUSE_Leap_15.0')
 K5START="k5start -t -f /etc/opensuse.keytab service/opensuse-mirror -- $TIMEOUT"
 
 # NOTE(hwoarang): Ensure old distros are not mirrored aymore
@@ -71,26 +73,10 @@ for DISTVER in 42.3 15.0; do
         --exclude="src/" \
         --exclude="nosrc/" \
         $MIRROR/$REPO/ $BASE/$REPO/
-
-    date --iso-8601=ns
-    for obs_repo in ${OBS_REPOS[@]}; do
-        REPO=repositories/${obs_repo}/openSUSE_Leap_${DISTVER}/
-        if ! [ -f $BASE/$REPO ]; then
-            $K5START mkdir -p $BASE/$REPO
-        fi
-        echo "Running rsync ${obs_repo} $DISTVER ..."
-        $K5START rsync -rlptDvz \
-            --delete --stats \
-            --delete-excluded \
-            --exclude="src/" \
-            --exclude="nosrc/" \
-            $OBS_MIRROR/$obs_repo/openSUSE_Leap_${DISTVER}/ $BASE/$REPO/
-    done
-
 done
 
 date --iso-8601=ns
-for obs_repo in ${CLOUD_OBS_REPOS[@]}; do
+for obs_repo in ${OBS_REPOS[@]}; do
     REPO=repositories/${obs_repo}/
     if ! [ -f $BASE/$REPO ]; then
         $K5START mkdir -p $BASE/$REPO