From c45508b2fa849d2574b8d7e16e0ab1d304c8a3dc Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 26 Jul 2024 14:55:46 -0700
Subject: [PATCH] Use the osuosl mirror for deb packages in image builds

The linaro cloud will be shutdown in the near future which means its
mirror will go away. Stop using its mirror for deb package content and
pull those packages from the osuosl mirror instead. This has the added
benefit of fetching the packages from the mirror that is local to the
builder which should be more efficient.

Change-Id: I5ea798faa0cb571834050f0082c7cf782e2641df
---
 nodepool/nb04.opendev.org.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nodepool/nb04.opendev.org.yaml b/nodepool/nb04.opendev.org.yaml
index 1651aa4792..0e6f7e490b 100644
--- a/nodepool/nb04.opendev.org.yaml
+++ b/nodepool/nb04.opendev.org.yaml
@@ -203,7 +203,7 @@ diskimages:
       - ubuntu-minimal
     release: bionic
     env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.regionone.linaro.opendev.org/ubuntu-ports'
+      DIB_DISTRIBUTION_MIRROR: 'http://mirror.regionone.osuosl.opendev.org/ubuntu-ports'
       DIB_DEBIAN_COMPONENTS: 'main,universe'
 
   - name: ubuntu-focal-arm64
@@ -212,7 +212,7 @@ diskimages:
       - ubuntu-minimal
     release: focal
     env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.regionone.linaro.opendev.org/ubuntu-ports'
+      DIB_DISTRIBUTION_MIRROR: 'http://mirror.regionone.osuosl.opendev.org/ubuntu-ports'
       DIB_DEBIAN_COMPONENTS: 'main,universe'
 
   - name: ubuntu-jammy-arm64
@@ -222,7 +222,7 @@ diskimages:
     release: jammy
     rebuild-age: 172800  # 2 days
     env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'https://mirror.regionone.linaro.opendev.org/ubuntu-ports'
+      DIB_DISTRIBUTION_MIRROR: 'https://mirror.regionone.osuosl.opendev.org/ubuntu-ports'
       DIB_DEBIAN_COMPONENTS: 'main,universe'
 
   - name: ubuntu-noble-arm64
@@ -232,7 +232,7 @@ diskimages:
     release: noble
     rebuild-age: 172800  # 2 days
     env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'https://mirror.regionone.linaro.opendev.org/ubuntu-ports'
+      DIB_DISTRIBUTION_MIRROR: 'https://mirror.regionone.osuosl.opendev.org/ubuntu-ports'
       DIB_DEBIAN_COMPONENTS: 'main,universe'
 
   - name: debian-bookworm-arm64
@@ -242,7 +242,7 @@ diskimages:
     release: bookworm
     rebuild-age: 172800  # 2 days
     env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'https://mirror.regionone.linaro.opendev.org/debian'
+      DIB_DISTRIBUTION_MIRROR: 'https://mirror.regionone.osuosl.opendev.org/debian'
 
   - name: debian-bullseye-arm64
     parent: base-debuntu
@@ -251,7 +251,7 @@ diskimages:
       - debian-minimal
     release: bullseye
     env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'https://mirror.regionone.linaro.opendev.org/debian'
+      DIB_DISTRIBUTION_MIRROR: 'https://mirror.regionone.osuosl.opendev.org/debian'
 
   - name: centos-8-stream-arm64
     parent: base
@@ -282,7 +282,7 @@ diskimages:
       - openeuler-minimal
     release: 22.03-LTS
     env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.regionone.linaro.opendev.org/openeuler'
+      DIB_DISTRIBUTION_MIRROR: 'http://mirror.regionone.osuosl.opendev.org/openeuler'
 
   - name: rockylinux-9-arm64
     parent: base