Merge pull request #1857 from justaugustus/ci-marker-k8s-infra

dl.k8s.io: Redirect CI URIs to Kubernetes Community infra
kubernetes · Jul 2, 2021 · f262df3 · f262df3
2 parents 93c590e + cb12adb
commit f262df3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/k8s.io/configmap-nginx.yaml b/k8s.io/configmap-nginx.yaml
@@ -158,7 +158,7 @@ data:
           # Don't require /release/ if you want to get at the Kubernetes release artifacts, the common case.
           rewrite ^/(v[0-9]+\.[0-9]+\.[0-9]+(-(alpha|beta|rc)\.[0-9]+)?/.*)$   https://storage.googleapis.com/kubernetes-release/release/$1 redirect;
           # Provide a convenient redirect for CI (continuous integration) artifacts as well, which live in a different bucket.
-          rewrite ^/ci(-cross)?/?(.*)$              https://storage.googleapis.com/kubernetes-release-dev/ci$1/$2 redirect;
+          rewrite ^/ci/?(.*)$              https://storage.googleapis.com/k8s-release-dev/ci$1/$2 redirect;
           rewrite ^/(.*)$                  https://storage.googleapis.com/kubernetes-release/$1 redirect;
         }
       }

diff --git a/k8s.io/test.py b/k8s.io/test.py
@@ -290,16 +290,12 @@ def test_dl(self):
             # A few /ci/ tests
             self.assert_temp_redirect(
                 base + '/ci/v$ver/$path',
-                'https://storage.googleapis.com/kubernetes-release-dev/ci/v$ver/$path',
+                'https://storage.googleapis.com/k8s-release-dev/ci/v$ver/$path',
                 ver=rand_num(), path=rand_num())
             self.assert_temp_redirect(
                 base + '/ci/latest-$ver.txt',
-                'https://storage.googleapis.com/kubernetes-release-dev/ci/latest-$ver.txt',
+                'https://storage.googleapis.com/k8s-release-dev/ci/latest-$ver.txt',
                 ver=rand_num())
-            self.assert_temp_redirect(
-                base + '/ci-cross/v$ver/$path',
-                'https://storage.googleapis.com/kubernetes-release-dev/ci-cross/v$ver/$path',
-                ver=rand_num(), path=rand_num())
             # Base case
             self.assert_temp_redirect(
                 base + '/$path',