Merge pull request #54977 from zouyee/e2e

Automatic merge from submit-queue (batch tested with PRs 51401, 54056, 54977, 55017, 55052). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. [test/e2e_node]Redirect dl.k8s.io to the kubernetes-release GCS bucket **What this PR does / why we need it**: fixes [#33726](https://github.com/kubernetes/kubernetes/pull/33726)Redirect dl.k8s.io to the kubernetes-release GCS bucket ref ：[kubernetes/k8s.io#15](https://github.com/kubernetes/k8s.io/pull/15) **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ``` NONE ```

Merge pull request #54977 from zouyee/e2e
ff8acb30 · Kubernetes Submit Queue · GitHub · 7e853132 · 68c5ce19 · ff8acb30
Unverified Commit ff8acb30 authored Nov 03, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 03, 2017
6 changed files
--- a/test/e2e_node/jenkins/cos-init-docker.yaml
+++ b/test/e2e_node/jenkins/cos-init-docker.yaml
@@ -117,7 +117,7 @@ runcmd:
  - mkdir -p /home/kubernetes/containerized_mounter/rootfs
  - mount --bind /home/kubernetes/containerized_mounter/ /home/kubernetes/containerized_mounter/
  - mount -o remount, exec /home/kubernetes/containerized_mounter/
-  - wget https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar -O /tmp/mounter.tar
+  - wget https://dl.k8s.io/gci-mounter/mounter.tar -O /tmp/mounter.tar
  - tar xvf /tmp/mounter.tar -C /home/kubernetes/containerized_mounter/rootfs
  - mkdir -p /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet
  - mount --rbind /var/lib/kubelet /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet

--- a/test/e2e_node/jenkins/cos-init-live-restore.yaml
+++ b/test/e2e_node/jenkins/cos-init-live-restore.yaml
@@ -12,7 +12,7 @@ runcmd:
  - mkdir -p /home/kubernetes/containerized_mounter/rootfs
  - mount --bind /home/kubernetes/containerized_mounter/ /home/kubernetes/containerized_mounter/
  - mount -o remount, exec /home/kubernetes/containerized_mounter/
-  - wget https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar -O /tmp/mounter.tar
+  - wget https://dl.k8s.io/gci-mounter/mounter.tar -O /tmp/mounter.tar
  - tar xvf /tmp/mounter.tar -C /home/kubernetes/containerized_mounter/rootfs
  - mkdir -p /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet
  - mount --rbind /var/lib/kubelet /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet

--- a/test/e2e_node/jenkins/gci-init-gpu.yaml
+++ b/test/e2e_node/jenkins/gci-init-gpu.yaml
@@ -9,7 +9,7 @@ runcmd:
  - mkdir -p /home/kubernetes/containerized_mounter/rootfs
  - mount --bind /home/kubernetes/containerized_mounter/ /home/kubernetes/containerized_mounter/
  - mount -o remount, exec /home/kubernetes/containerized_mounter/
-  - wget https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar -O /tmp/mounter.tar
+  - wget https://dl.k8s.io/gci-mounter/mounter.tar -O /tmp/mounter.tar
  - tar xvf /tmp/mounter.tar -C /home/kubernetes/containerized_mounter/rootfs
  - mkdir -p /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet
  - mount --rbind /var/lib/kubelet /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet

--- a/test/e2e_node/jenkins/gci-init.yaml
+++ b/test/e2e_node/jenkins/gci-init.yaml
@@ -7,7 +7,7 @@ runcmd:
  - mkdir -p /home/kubernetes/containerized_mounter/rootfs
  - mount --bind /home/kubernetes/containerized_mounter/ /home/kubernetes/containerized_mounter/
  - mount -o remount, exec /home/kubernetes/containerized_mounter/
-  - wget https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar -O /tmp/mounter.tar
+  - wget https://dl.k8s.io/gci-mounter/mounter.tar -O /tmp/mounter.tar
  - tar xvf /tmp/mounter.tar -C /home/kubernetes/containerized_mounter/rootfs
  - mkdir -p /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet
  - mount --rbind /var/lib/kubelet /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet

--- a/test/e2e_node/jenkins/ubuntu-init-docker.yaml
+++ b/test/e2e_node/jenkins/ubuntu-init-docker.yaml
@@ -111,7 +111,7 @@ runcmd:
  - mkdir -p /home/kubernetes/containerized_mounter/rootfs
  - mount --bind /home/kubernetes/containerized_mounter/ /home/kubernetes/containerized_mounter/
  - mount -o remount, exec /home/kubernetes/containerized_mounter/
-  - wget https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar -O /tmp/mounter.tar
+  - wget https://dl.k8s.io/gci-mounter/mounter.tar -O /tmp/mounter.tar
  - tar xvf /tmp/mounter.tar -C /home/kubernetes/containerized_mounter/rootfs
  - mkdir -p /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet
  - mount --rbind /var/lib/kubelet /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet

--- a/test/e2e_node/remote/utils.go
+++ b/test/e2e_node/remote/utils.go
@@ -31,7 +31,7 @@ const (
 	cniArch          = "amd64"
 	cniDirectory     = "cni/bin" // The CNI tarball places binaries under directory under "cni/bin".
 	cniConfDirectory = "cni/net.d"
-	cniURL           = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-" + cniArch + "-" + cniVersion + ".tgz"
+	cniURL           = "https://dl.k8s.io/network-plugins/cni-plugins-" + cniArch + "-" + cniVersion + ".tgz"
 )

 const cniConfig = `{