From 5cea4cd63f3acf2e4e307782990a1a51e45c833c Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 10 Jan 2022 14:06:46 -0800
Subject: [PATCH] Remove opensuse tumbleweed from our mirrors

Tumbleweed images were an interesting idea to add forward looking
testing of a very new and up to date linux distro. Unfortunately, the
images don't receive the attention they deserve to remain in our CI
system, and nothing seems to use the images anyway. Clean up our
opensuse mirrors and stop mirroring tumbleweed as one step in this clean
up process.

This depends on the change that removes the CI label/images.

Depends-On: https://review.opendev.org/c/openstack/project-config/+/824071
Change-Id: Ie1488b453463da750e1a08536116e44ec129828e
---
 .../files/opensuse-mirror-update              | 33 ++-----------------
 1 file changed, 2 insertions(+), 31 deletions(-)

diff --git a/playbooks/roles/mirror-update/files/opensuse-mirror-update b/playbooks/roles/mirror-update/files/opensuse-mirror-update
index 9bc807323f..f0e82013f9 100755
--- a/playbooks/roles/mirror-update/files/opensuse-mirror-update
+++ b/playbooks/roles/mirror-update/files/opensuse-mirror-update
@@ -39,7 +39,8 @@ 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/15.1 update/leap/15.1 \
         repositories/Cloud:/OpenStack:/Stein/openSUSE_Leap_15.1 \
-        repositories/Cloud:/OpenStack:/Master/openSUSE_Leap_15.1 ; do
+        repositories/Cloud:/OpenStack:/Master/openSUSE_Leap_15.1 \
+        update/tumbleweed tumbleweed ; do
     if [ -d $BASE/$REPO ]; then
         $K5START rm -rf $BASE/$REPO
     fi
@@ -92,36 +93,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 -rltvz \
-    --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 -rltvz \
-    --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."
 vos_release $MIRROR_VOLUME