diff --git a/playbooks/roles/mirror-update/files/opensuse-mirror-update b/playbooks/roles/mirror-update/files/opensuse-mirror-update index 2b25ef56e5..e2d4bb1bc2 100755 --- a/playbooks/roles/mirror-update/files/opensuse-mirror-update +++ b/playbooks/roles/mirror-update/files/opensuse-mirror-update @@ -30,64 +30,23 @@ BASE="/afs/.openstack.org/mirror/opensuse" MIRROR="rsync://mirror.clarkson.edu/opensuse/opensuse" OBS_MIRROR="rsync://provo-mirror.opensuse.org/opensuse/repositories" OBS_REPOS=( - 'Cloud:/OpenStack:/Ussuri/openSUSE_Leap_15.2' - 'Cloud:/OpenStack:/Master/openSUSE_Leap_15.2' - # NOTE(yoctozepto): kolla uses the following for hacluster 'network:/ha-clustering:/Stable/CentOS_CentOS-7' ) 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 \ +for REPO in distribution/leap/15.1 update/leap/15.1 distribution/leap/15.2 \ repositories/Cloud:/OpenStack:/Stein/openSUSE_Leap_15.1 \ repositories/Cloud:/OpenStack:/Master/openSUSE_Leap_15.1 \ + repositories/Cloud:/OpenStack:/Ussuri/openSUSE_Leap_15.2 \ + repositories/Cloud:/OpenStack:/Master/openSUSE_Leap_15.2 \ update/tumbleweed tumbleweed ; do if [ -d $BASE/$REPO ]; then $K5START rm -rf $BASE/$REPO fi done -for DISTVER in 15.2 ; do - REPO=distribution/leap/$DISTVER/repo - if ! [ -f $BASE/$REPO ]; then - $K5START mkdir -p $BASE/$REPO - fi - - date --iso-8601=ns - echo "Running rsync distribution $DISTVER ..." - $K5START rsync -rltvz \ - --delete --stats \ - --delete-excluded \ - --exclude="iso" \ - --exclude="non-oss/" \ - --exclude=".~tmp~" \ - $MIRROR/$REPO/ $BASE/$REPO/ - - REPO=update/leap/$DISTVER - if ! [ -f $BASE/$REPO ]; then - $K5START mkdir -p $BASE/$REPO - fi - - date --iso-8601=ns - echo "Running rsync updates $DISTVER ..." - $K5START rsync -rltvz \ - --delete --stats \ - --delete-excluded \ - --exclude="src/" \ - --exclude="nosrc/" \ - --exclude="non-oss/" \ - --exclude="non-oss_debug/" \ - --exclude="oss_debug/" \ - --exclude="aarch64/" \ - --exclude="i586/" \ - --exclude="i686/" \ - --exclude="ppc64le/" \ - --exclude="s390x/" \ - --exclude=".~tmp~" \ - $MIRROR/$REPO/ $BASE/$REPO/ -done - date --iso-8601=ns for obs_repo in ${OBS_REPOS[@]}; do REPO=repositories/${obs_repo}/