From f727a542a69156cf04aaa6163a255d4a4e7eb9f3 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 26 Apr 2022 18:07:06 +0000
Subject: [PATCH] Drop source package mirroring for ubuntu-ports

Our CI jobs generally don't make use of source packages, and because
pulling them requires a separate line in sources.list anyway any
jobs which want them can add an official mirror source easily.
Remove from the configured architectures list in ubuntu-ports
initially, since ARM jobs are even less likely to be impacted by
this due to their scant number and limited frequency. This will
allow us to evaluate the fallout and determine whether manual
cleanup is needed afterward.

Change-Id: Ib647b6733529d965fa9caa92ad4d123639510083
---
 .../files/ubuntu-ports/config/distributions      | 16 ++++++++--------
 .../reprepro/files/ubuntu-ports/config/updates   |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/playbooks/roles/reprepro/files/ubuntu-ports/config/distributions b/playbooks/roles/reprepro/files/ubuntu-ports/config/distributions
index 04a847c0e3..a90f493bd1 100755
--- a/playbooks/roles/reprepro/files/ubuntu-ports/config/distributions
+++ b/playbooks/roles/reprepro/files/ubuntu-ports/config/distributions
@@ -1,7 +1,7 @@
 Origin: Ubuntu
 Codename: bionic
 Description: OpenStack Ubuntu Bionic mirror
-Architectures: arm64 source
+Architectures: arm64
 Components: main universe
 UDebComponents: main
 Contents: .gz
@@ -11,7 +11,7 @@ Log: /var/log/reprepro/ubuntu-ports-bionic.log
 Origin: Ubuntu
 Codename: bionic-updates
 Description: OpenStack Ubuntu Bionic Updates mirror
-Architectures: arm64 source
+Architectures: arm64
 Components: main universe
 UDebComponents: main
 Contents: .gz
@@ -21,7 +21,7 @@ Log: /var/log/reprepro/ubuntu-ports-bionic-updates.log
 Origin: Ubuntu
 Codename: bionic-backports
 Description: OpenStack Ubuntu Bionic Backports mirror
-Architectures: arm64 source
+Architectures: arm64
 Components: main universe
 UDebComponents: main
 Contents: .gz
@@ -33,7 +33,7 @@ Log: /var/log/reprepro/ubuntu-ports-bionic-backports.log
 Origin: Ubuntu
 Codename: bionic-security
 Description: OpenStack Ubuntu Bionic Security mirror
-Architectures: arm64 source
+Architectures: arm64
 Components: main universe
 UDebComponents: main
 Contents: .gz
@@ -43,7 +43,7 @@ Log: /var/log/reprepro/ubuntu-ports-bionic-security.log
 Origin: Ubuntu
 Codename: focal
 Description: OpenStack Ubuntu Focal mirror
-Architectures: arm64 source
+Architectures: arm64
 Components: main universe
 UDebComponents: main
 Contents: .gz
@@ -53,7 +53,7 @@ Log: /var/log/reprepro/ubuntu-ports-focal.log
 Origin: Ubuntu
 Codename: focal-updates
 Description: OpenStack Ubuntu Focal Updates mirror
-Architectures: arm64 source
+Architectures: arm64
 Components: main universe
 UDebComponents: main
 Contents: .gz
@@ -63,7 +63,7 @@ Log: /var/log/reprepro/ubuntu-ports-focal-updates.log
 Origin: Ubuntu
 Codename: focal-backports
 Description: OpenStack Ubuntu Focal Backports mirror
-Architectures: arm64 source
+Architectures: arm64
 Components: main universe
 UDebComponents: main
 Contents: .gz
@@ -75,7 +75,7 @@ Log: /var/log/reprepro/ubuntu-ports-focal-backports.log
 Origin: Ubuntu
 Codename: focal-security
 Description: OpenStack Ubuntu Focal Security mirror
-Architectures: arm64 source
+Architectures: arm64
 Components: main universe
 UDebComponents: main
 Contents: .gz
diff --git a/playbooks/roles/reprepro/files/ubuntu-ports/config/updates b/playbooks/roles/reprepro/files/ubuntu-ports/config/updates
index dd61cb607f..bd51ec8503 100755
--- a/playbooks/roles/reprepro/files/ubuntu-ports/config/updates
+++ b/playbooks/roles/reprepro/files/ubuntu-ports/config/updates
@@ -2,7 +2,7 @@ Name: ubuntu
 Method: http://us.archive.ubuntu.com/ubuntu
 Components: main universe
 UDebComponents: main
-Architectures: amd64 source
+Architectures: amd64
 GetInRelease: no
 VerifyRelease: 437D05B5|C0B21F32
 
@@ -10,7 +10,7 @@ Name: ubuntu-security
 Method: http://security.ubuntu.com/ubuntu
 Components: main universe
 UDebComponents: main
-Architectures: amd64 source
+Architectures: amd64
 GetInRelease: no
 VerifyRelease: 437D05B5|C0B21F32
 
@@ -18,7 +18,7 @@ Name: ubuntu-ports
 Method: http://ports.ubuntu.com/ubuntu-ports
 Components: main universe
 UDebComponents: main
-Architectures: arm64 source
+Architectures: arm64
 GetInRelease: no
 VerifyRelease: 437D05B5|C0B21F32
 
@@ -26,6 +26,6 @@ Name: ubuntu-ports-security
 Method: http://ports.ubuntu.com/ubuntu-ports
 Components: main universe
 UDebComponents: main
-Architectures: arm64 source
+Architectures: arm64
 GetInRelease: no
 VerifyRelease: 437D05B5|C0B21F32