rec: update umbrella top million URLs

After suggestion by @mnordhoff in IRC

diff --git a/.github/workflows/misc-dailies.yml b/.github/workflows/misc-dailies.yml
index 6ff4ca2c98390ebbfb7e680c53d0147540b6f544..0ffa8d8a1c1dc0d6794f0d65cb93c7f54f11e798 100644 (file)
--- a/.github/workflows/misc-dailies.yml
+++ b/.github/workflows/misc-dailies.yml
@@ -157,7 +157,7 @@ jobs:
       - name: Install Recursor Package and PDNS Tools
         run: sudo apt install pdns-recursor pdns-tools
       - name: Get Top Million Names
-        run: curl --no-progress-meter -LO http://s3-us-west-1.amazonaws.com/umbrella-static/top-1m.csv.zip && unzip top-1m.csv.zip -d .
+        run: curl --no-progress-meter -LO https://umbrella-static.s3.dualstack.us-west-1.amazonaws.com/top-1m.csv.zip && unzip top-1m.csv.zip -d .
         working-directory: regression-tests
       - name: Run Bulk Test
         run: ./recursor-test 5300 ${{ matrix.testsize }} 8 2048 1024

diff --git a/build-scripts/test-recursor-bulk b/build-scripts/test-recursor-bulk
index e4258e2da0288961d58b36aaaaecf4b6b94aadb2..39894dd6b723ecf9877f8f3deef8556b2b4181bc 100755 (executable)
--- a/build-scripts/test-recursor-bulk
+++ b/build-scripts/test-recursor-bulk
@@ -14,7 +14,7 @@ set -x
 cd regression-tests
 
 rm -f top-1m.csv
-wget -c -N http://s3-us-west-1.amazonaws.com/umbrella-static/top-1m.csv.zip
+wget -c -N https://umbrella-static.s3.dualstack.us-west-1.amazonaws.com/top-1m.csv.zip
 
 unzip top-1m.csv.zip
 

diff --git a/tasks.py b/tasks.py
index 53de26e037087fbfefbd975e1a9dc750d7b00f62..96d3d00902c656cd2a980ea113ede1e6a44076c4 100644 (file)
--- a/tasks.py
+++ b/tasks.py
@@ -1172,7 +1172,7 @@ def test_regression_recursor(c):
 @task
 def test_bulk_recursor(c, size, threads, mthreads, shards, ipv6):
     with c.cd('regression-tests'):
-        c.run('curl --no-progress-meter -LO http://s3-us-west-1.amazonaws.com/umbrella-static/top-1m.csv.zip')
+        c.run('curl --no-progress-meter -LO https://umbrella-static.s3.dualstack.us-west-1.amazonaws.com/top-1m.csv.zip')
         c.run('unzip top-1m.csv.zip -d .')
         c.run('chmod +x /opt/pdns-recursor/bin/* /opt/pdns-recursor/sbin/*')
         c.run(f'DNSBULKTEST=/usr/bin/dnsbulktest RECURSOR=/opt/pdns-recursor/sbin/pdns_recursor RECCONTROL=/opt/pdns-recursor/bin/rec_control IPv6={ipv6} THRESHOLD=95 TRACE=no ./recursor-test 5300 {size} {threads} {mthreads} {shards}')