From 195e76fa07d02277f098e6df33ce0cd51fdc9a4f Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 25 Jun 2024 09:15:07 -0700 Subject: [PATCH] Remove centos rsync mirroring tooling Now that CentOS 7, 8 and 8-stream have been removed from mirroring we can drop the mirror script for these releases entirely. Note that 9-stream and beyond use the newer centos-stream script instead and are not affected. Once this is completed we should be able to clean up the afs volume for centos entirely as well (though it is empty currently and has a very low cost in that state). Change-Id: I744c61e3386d4ea54efaae9c3a46fd08878263ff --- .../mirror-update/files/centos-mirror-update | 56 ------------------- .../roles/mirror-update/tasks/rsync.yaml | 2 +- testinfra/test_mirror-update.py | 8 +-- 3 files changed, 4 insertions(+), 62 deletions(-) delete mode 100755 playbooks/roles/mirror-update/files/centos-mirror-update diff --git a/playbooks/roles/mirror-update/files/centos-mirror-update b/playbooks/roles/mirror-update/files/centos-mirror-update deleted file mode 100755 index d61d456096..0000000000 --- a/playbooks/roles/mirror-update/files/centos-mirror-update +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash -xe -# Copyright 2016 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -source /usr/share/mirror-update/functions.sh - -MIRROR_VOLUME=$1 - -# Runs with timeout under cron -if [[ ${UNDER_CRON:-0} -eq 0 ]]; then - echo_ts "Running interactively" - TIMEOUT="" - set -x -else - TIMEOUT="timeout -k 2m 90m" -fi - -_DRY_RUN='' -if [[ ${DRY_RUN:-0} -eq 1 ]]; then - echo "Dry run only" - _DRY_RUN='--dry-run' -fi - -RSYNC="rsync ${_DRY_RUN} -rltvz" - -BASE="/afs/.openstack.org/mirror/centos" -K5START="k5start -t -f /etc/centos.keytab service/centos-mirror -- $TIMEOUT" - -if [[ ${DRY_RUN:-0} -ne 1 ]]; then - # Cleanup old repos - for REPO in 8-stream ; do - if [ -d $BASE/$REPO/ ]; then - $K5START rm -rf $BASE/$REPO/ - fi - done -fi - -if [[ ${DRY_RUN:-0} -ne 1 ]]; then - date --iso-8601=ns | $K5START tee $BASE/timestamp.txt - echo "rsync completed successfully, running vos release." - vos_release $MIRROR_VOLUME -fi - -date --iso-8601=ns -echo "Done." diff --git a/playbooks/roles/mirror-update/tasks/rsync.yaml b/playbooks/roles/mirror-update/tasks/rsync.yaml index 0e9bffeb49..bbac07c51e 100644 --- a/playbooks/roles/mirror-update/tasks/rsync.yaml +++ b/playbooks/roles/mirror-update/tasks/rsync.yaml @@ -14,7 +14,6 @@ - name: Set update script names set_fact: rsync_update_scripts: - - centos - centos-stream - epel - fedora @@ -25,6 +24,7 @@ set_fact: cleanup_rsync_update_scripts: - opensuse + - centos ##### Script creation ##### diff --git a/testinfra/test_mirror-update.py b/testinfra/test_mirror-update.py index a7d5186cb1..69e4e931d4 100644 --- a/testinfra/test_mirror-update.py +++ b/testinfra/test_mirror-update.py @@ -27,8 +27,7 @@ def test_tools(host): assert f.exists def test_rsync_scripts(host): - for script in ['centos', - 'centos-stream', + for script in ['centos-stream', 'epel', 'fedora', 'openeuler', @@ -37,7 +36,7 @@ def test_rsync_scripts(host): assert f.exists def test_rsync_scripts_removed(host): - for script in ['opensuse']: + for script in ['opensuse', 'centos']: f = host.file('/usr/local/bin/%s-mirror-update' % script) assert not f.exists @@ -48,7 +47,6 @@ def test_publisher_script(host): def test_keytabs(host): for keytab in ['/etc/afsadmin.keytab', '/etc/logs.keytab', - '/etc/centos.keytab', '/etc/centos-stream.keytab', '/etc/epel.keytab', '/etc/fedora.keytab', @@ -62,7 +60,7 @@ def test_keytabs(host): assert f.mode == 0o400 def test_keytabs_removed(host): - for keytab in ['/etc/opensuse.keytab']: + for keytab in ['/etc/opensuse.keytab', '/etc/centos.keytab']: f = host.file(keytab) assert not f.exists