From df0e6861dc30003914531ed7f4a7edfff8686a95 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 13 Jan 2023 11:06:14 +0100
Subject: [PATCH] build-and-test-all: add functionality to quickly switch
 ubuntu mirrors

---
 .github/workflows/build-and-test-all.yml | 11 +++++++++++
 build-scripts/gh-actions-setup-inv       |  1 -
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml
index dc3f0d1791..573a4862ee 100644
--- a/.github/workflows/build-and-test-all.yml
+++ b/.github/workflows/build-and-test-all.yml
@@ -18,6 +18,7 @@ jobs:
       UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ github.workspace }}/build-scripts/UBSan.supp"
       ASAN_OPTIONS: detect_leaks=0
     steps:
+      - uses: PowerDNS/pdns/set-ubuntu-mirror@meta
       - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: 5
@@ -64,6 +65,7 @@ jobs:
       run:
         working-directory: ./pdns/recursordist/
     steps:
+      - uses: PowerDNS/pdns/set-ubuntu-mirror@meta
       - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: 5
@@ -114,6 +116,7 @@ jobs:
       run:
         working-directory: ./pdns/dnsdistdist/
     steps:
+      - uses: PowerDNS/pdns/set-ubuntu-mirror@meta
       - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: 5
@@ -179,6 +182,7 @@ jobs:
         options: >-
           --restart always
     steps:
+      - uses: PowerDNS/pdns/set-ubuntu-mirror@meta
       - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: 5
@@ -241,6 +245,7 @@ jobs:
         options: >-
           --restart always
     steps:
+      - uses: PowerDNS/pdns/set-ubuntu-mirror@meta
       - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: 5
@@ -265,6 +270,7 @@ jobs:
       UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ github.workspace }}/build-scripts/UBSan.supp"
       ASAN_OPTIONS: detect_leaks=0
     steps:
+      - uses: PowerDNS/pdns/set-ubuntu-mirror@meta
       - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: 5
@@ -290,6 +296,7 @@ jobs:
       ASAN_OPTIONS: detect_leaks=0
       TSAN_OPTIONS: "halt_on_error=1:suppressions=${{ github.workspace }}/pdns/recursordist/recursor-tsan.supp"
     steps:
+      - uses: PowerDNS/pdns/set-ubuntu-mirror@meta
       - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: 5
@@ -316,6 +323,7 @@ jobs:
       ASAN_OPTIONS: detect_leaks=0
       TSAN_OPTIONS: "halt_on_error=1:suppressions=${{ github.workspace }}/pdns/recursordist/recursor-tsan.supp"
     steps:
+      - uses: PowerDNS/pdns/set-ubuntu-mirror@meta
       - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: 5
@@ -346,6 +354,7 @@ jobs:
       ASAN_OPTIONS: detect_leaks=0
       TSAN_OPTIONS: "halt_on_error=1:suppressions=${{ github.workspace }}/pdns/recursordist/recursor-tsan.supp"
     steps:
+      - uses: PowerDNS/pdns/set-ubuntu-mirror@meta
       - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: 5
@@ -374,6 +383,7 @@ jobs:
       # IncludeDir tests are disabled because of a weird interaction between TSAN and these tests which ever only happens on GH actions
       SKIP_INCLUDEDIR_TESTS: yes
     steps:
+      - uses: PowerDNS/pdns/set-ubuntu-mirror@meta
       - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: 5
@@ -391,6 +401,7 @@ jobs:
   swagger-syntax-check:
     runs-on: ubuntu-20.04
     steps:
+      - uses: PowerDNS/pdns/set-ubuntu-mirror@meta
       - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: 5
diff --git a/build-scripts/gh-actions-setup-inv b/build-scripts/gh-actions-setup-inv
index 39bde3d281..2a5f441351 100755
--- a/build-scripts/gh-actions-setup-inv
+++ b/build-scripts/gh-actions-setup-inv
@@ -5,7 +5,6 @@ exit 101
 EOF
 "
 sudo chmod 755 /usr/sbin/policy-rc.d
-sudo sed -i 's/azure\.//' /etc/apt/sources.list
 sudo apt-get update
 sudo apt-get -qq -y dist-upgrade
 sudo apt-get -qq -y --no-install-recommends install python3-pip
-- 
2.47.2