Merge "Stop mirroring Xenial mirror content"

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

playbooks/roles/reprepro/files/debian-docker-xenial/config/distributions

@@ -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
-

playbooks/roles/reprepro/files/debian-docker-xenial/config/options

@@ -1,6 +0,0 @@
-basedir /afs/.openstack.org/mirror/deb-docker/xenial
-keepunreferencedfiles
-noskipold
-export changed
-spacecheck none
-verbose

playbooks/roles/reprepro/files/debian-docker-xenial/config/updates

@@ -1,7 +0,0 @@
-Name: debian-docker
-Method: https://download.docker.com/linux/ubuntu/
-Components: stable
-UDebComponents: stable
-Architectures: amd64
-GetInRelease: no
-VerifyRelease: F273FCD8

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

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
-

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) }}'

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',