From b78ed11b816e4d53cd2cf00ad4f2773e3c97baaf Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 29 Jul 2025 14:00:10 -0700 Subject: [PATCH] Stop mirroring Xenial mirror content We're no longer providing Xenial test nodes with the switch to Nodepool in Zuul. Remove configuration for Xenial mirroring. I believe that we'll need to follow this up with manual cleanups to actually remove the content with reprepro as dropping the config doesn't lead to deleting files. This will only prevent time spent attempting to update the files. Change-Id: Ib07804d510d978fed3760dd97f9725bc9520e266 --- .../files/apt-puppetlabs/config/distributions | 18 ------- .../debian-docker-xenial/config/distributions | 10 ---- .../files/debian-docker-xenial/config/options | 6 --- .../files/debian-docker-xenial/config/updates | 7 --- .../ubuntu-cloud-archive/config/distributions | 36 -------------- .../files/ubuntu/config/distributions | 47 ------------------- playbooks/roles/reprepro/tasks/docker.yaml | 7 +-- testinfra/test_mirror-update.py | 1 - 8 files changed, 1 insertion(+), 131 deletions(-) delete mode 100755 playbooks/roles/reprepro/files/debian-docker-xenial/config/distributions delete mode 100755 playbooks/roles/reprepro/files/debian-docker-xenial/config/options delete mode 100755 playbooks/roles/reprepro/files/debian-docker-xenial/config/updates diff --git a/playbooks/roles/reprepro/files/apt-puppetlabs/config/distributions b/playbooks/roles/reprepro/files/apt-puppetlabs/config/distributions index b7226f0940..20d3466d27 100755 --- a/playbooks/roles/reprepro/files/apt-puppetlabs/config/distributions +++ b/playbooks/roles/reprepro/files/apt-puppetlabs/config/distributions @@ -1,21 +1,3 @@ -Origin: Puppetlabs -Codename: xenial -Description: PuppetLabs Xenial mirror -Architectures: amd64 -Components: puppet5 -Contents: .gz -Update: puppetlabs-debs -Log: /var/log/reprepro/ubuntu-puppetlabs-xenial.log - -Origin: Puppetlabs -Codename: stretch -Description: PuppetLabs Stretch mirror -Architectures: amd64 -Components: puppet5 puppet6 -Contents: .gz -Update: puppetlabs-debs -Log: /var/log/reprepro/ubuntu-puppetlabs-stretch.log - Origin: Puppetlabs Codename: bionic Description: PuppetLabs Bionic mirror diff --git a/playbooks/roles/reprepro/files/debian-docker-xenial/config/distributions b/playbooks/roles/reprepro/files/debian-docker-xenial/config/distributions deleted file mode 100755 index 75659f8256..0000000000 --- a/playbooks/roles/reprepro/files/debian-docker-xenial/config/distributions +++ /dev/null @@ -1,10 +0,0 @@ -Origin: Docker -Codename: xenial -Description: Docker Xenial mirror -Architectures: amd64 arm64 -Components: stable -UDebComponents: -Contents: .gz -Update: debian-docker -Log: /var/log/reprepro/debian-docker-xenial.log - diff --git a/playbooks/roles/reprepro/files/debian-docker-xenial/config/options b/playbooks/roles/reprepro/files/debian-docker-xenial/config/options deleted file mode 100755 index 6baad7e5f4..0000000000 --- a/playbooks/roles/reprepro/files/debian-docker-xenial/config/options +++ /dev/null @@ -1,6 +0,0 @@ -basedir /afs/.openstack.org/mirror/deb-docker/xenial -keepunreferencedfiles -noskipold -export changed -spacecheck none -verbose diff --git a/playbooks/roles/reprepro/files/debian-docker-xenial/config/updates b/playbooks/roles/reprepro/files/debian-docker-xenial/config/updates deleted file mode 100755 index f3a04db241..0000000000 --- a/playbooks/roles/reprepro/files/debian-docker-xenial/config/updates +++ /dev/null @@ -1,7 +0,0 @@ -Name: debian-docker -Method: https://download.docker.com/linux/ubuntu/ -Components: stable -UDebComponents: stable -Architectures: amd64 -GetInRelease: no -VerifyRelease: F273FCD8 diff --git a/playbooks/roles/reprepro/files/ubuntu-cloud-archive/config/distributions b/playbooks/roles/reprepro/files/ubuntu-cloud-archive/config/distributions index a3b7a2b286..f461870cd2 100755 --- a/playbooks/roles/reprepro/files/ubuntu-cloud-archive/config/distributions +++ b/playbooks/roles/reprepro/files/ubuntu-cloud-archive/config/distributions @@ -1,39 +1,3 @@ -Origin: Canonical -Codename: xenial-updates/newton -Description: OpenStack Newton Archive for Ubuntu Xenial -Architectures: amd64 arm64 -Components: main -Contents: .gz -Update: ubuntu-cloud-archive -Log: /var/log/reprepro/ubuntu-cloud-archive-xenial.log - -Origin: Canonical -Codename: xenial-updates/ocata -Description: OpenStack Ocata Archive for Ubuntu Xenial -Architectures: amd64 arm64 -Components: main -Contents: .gz -Update: ubuntu-cloud-archive -Log: /var/log/reprepro/ubuntu-cloud-archive-xenial.log - -Origin: Canonical -Codename: xenial-updates/pike -Description: OpenStack Pike Archive for Ubuntu Xenial -Architectures: amd64 arm64 -Components: main -Contents: .gz -Update: ubuntu-cloud-archive -Log: /var/log/reprepro/ubuntu-cloud-archive-xenial.log - -Origin: Canonical -Codename: xenial-updates/queens -Description: OpenStack Queens Archive for Ubuntu Xenial -Architectures: amd64 arm64 -Components: main -Contents: .gz -Update: ubuntu-cloud-archive -Log: /var/log/reprepro/ubuntu-cloud-archive-xenial.log - Origin: Canonical Codename: bionic-updates/rocky Description: OpenStack Rocky Archive for Ubuntu Bionic diff --git a/playbooks/roles/reprepro/files/ubuntu/config/distributions b/playbooks/roles/reprepro/files/ubuntu/config/distributions index 962ba4e969..04e7da60e1 100755 --- a/playbooks/roles/reprepro/files/ubuntu/config/distributions +++ b/playbooks/roles/reprepro/files/ubuntu/config/distributions @@ -181,50 +181,3 @@ UDebComponents: main Contents: .gz Update: ubuntu-security Log: /var/log/reprepro/ubuntu-noble-security.log - -Origin: Ubuntu -Label: Ubuntu -Codename: xenial -Description: OpenStack Ubuntu Xenial mirror -Architectures: amd64 -Components: main universe -UDebComponents: main -Contents: .gz -Update: ubuntu -Log: /var/log/reprepro/ubuntu-xenial.log - -Origin: Ubuntu -Label: Ubuntu -Codename: xenial-updates -Description: OpenStack Ubuntu Xenial Updates mirror -Architectures: amd64 -Components: main universe -UDebComponents: main -Contents: .gz -Update: ubuntu -Log: /var/log/reprepro/ubuntu-xenial-updates.log - -Origin: Ubuntu -Label: Ubuntu -Codename: xenial-backports -Description: OpenStack Ubuntu Xenial Backports mirror -Architectures: amd64 -Components: main universe -UDebComponents: main -Contents: .gz -Update: ubuntu -NotAutomatic: yes -ButAutomaticUpgrades: yes -Log: /var/log/reprepro/ubuntu-xenial-backports.log - -Origin: Ubuntu -Label: Ubuntu -Codename: xenial-security -Description: OpenStack Ubuntu Xenial Security mirror -Architectures: amd64 -Components: main universe -UDebComponents: main -Contents: .gz -Update: ubuntu-security -Log: /var/log/reprepro/ubuntu-xenial-security.log - diff --git a/playbooks/roles/reprepro/tasks/docker.yaml b/playbooks/roles/reprepro/tasks/docker.yaml index ab3a8c6d1e..6620033b93 100644 --- a/playbooks/roles/reprepro/tasks/docker.yaml +++ b/playbooks/roles/reprepro/tasks/docker.yaml @@ -8,11 +8,6 @@ # and we have to mirror each distro separately to avoid file # conflicts (they have the same .deb files) -- name: Copy Debian Docker Xenial config - include_tasks: utils/copy-config.yaml - vars: - _dir: 'debian-docker-xenial' - - name: Copy Debian Docker Bionic include_tasks: utils/copy-config.yaml vars: @@ -37,7 +32,7 @@ - name: Install update cron jobs cron: name: 'Debian Docker reprepro mirror sync' - job: 'flock -n /var/run/reprepro/debian-docker.lock bash -c "for DISTRO in xenial bionic focal jammy noble; do reprepro-mirror-update /etc/reprepro/debian-docker-\$DISTRO mirror.deb-docker >>/var/log/reprepro/debian-docker-\$DISTRO-mirror.log 2>&1; done"' + job: 'flock -n /var/run/reprepro/debian-docker.lock bash -c "for DISTRO in bionic focal jammy noble; do reprepro-mirror-update /etc/reprepro/debian-docker-\$DISTRO mirror.deb-docker >>/var/log/reprepro/debian-docker-\$DISTRO-mirror.log 2>&1; done"' state: present hour: '*/2' minute: '{{ 45 | random(seed=inventory_hostname) }}' diff --git a/testinfra/test_mirror-update.py b/testinfra/test_mirror-update.py index 62a8a2968c..a8e6a251fd 100644 --- a/testinfra/test_mirror-update.py +++ b/testinfra/test_mirror-update.py @@ -111,7 +111,6 @@ def test_reprepro_configs(host): 'debian-ceph-nautilus', 'debian-ceph-quincy', 'debian-ceph-reef', - 'debian-docker-xenial', 'debian-docker-bionic', 'debian-docker-focal', 'ubuntu',