From 4ea57feabba0516a4707e064319ffe519b8ee2f7 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 20 Aug 2020 11:42:27 +1000
Subject: [PATCH] arm64 mirror : update to Focal

We have having constant issues with the bionic arm64 mirror shutting
itself off.  Before we go too far down the path of debugging what
appears to be a kernel oops issue, let's rebuild it as focal.

Update the sources list in the base.  Update the testing to use a
focal node.

Change-Id: I5b7106e2263010ff353e8a1de43e73b0c0ec57e1
---
 .../roles/base/repos/files/sources.list.focal.aarch64     | 8 ++++++++
 zuul.d/system-config-run.yaml                             | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 playbooks/roles/base/repos/files/sources.list.focal.aarch64

diff --git a/playbooks/roles/base/repos/files/sources.list.focal.aarch64 b/playbooks/roles/base/repos/files/sources.list.focal.aarch64
new file mode 100644
index 0000000000..222a08fb96
--- /dev/null
+++ b/playbooks/roles/base/repos/files/sources.list.focal.aarch64
@@ -0,0 +1,8 @@
+# This file is kept updated by ansible, adapted from
+# https://help.ubuntu.com/lts/serverguide/configuration.html
+# Note the use of ports.ubuntu.com.
+
+deb http://ports.ubuntu.com/ubuntu-ports/ focal main universe
+deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main universe
+deb http://ports.ubuntu.com/ubuntu-ports/ focal-backports main universe
+deb http://ports.ubuntu.com/ubuntu-ports/ focal-security main universe
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index a4ccb41fea..bc0d6a1945 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -371,6 +371,7 @@
     files:
       - playbooks/install-ansible.yaml
       - roles/
+      - playbooks/roles/base/
       - inventory/service/group_vars/mirror.yaml
       - playbooks/roles/mirror/
       - playbooks/roles/letsencrypt
@@ -401,7 +402,7 @@
         - name: bridge.openstack.org
           label: ubuntu-bionic-arm64
         - name: mirror01.openafs.provider.opendev.org
-          label: ubuntu-bionic-arm64
+          label: ubuntu-focal-arm64
 
 - job:
     name: system-config-run-mirror-update