Merge pull request #22861 from chewong/capz-use-kubekin-master

azure: use kubekins-e2e master instead of release branches
kubernetes · Jul 12, 2021 · 43b031e · 43b031e
2 parents 3e0d778 + cf4afa8
commit 43b031e
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 31 deletions.
diff --git a/config/jobs/kubernetes/sig-cloud-provider/azure/generate.sh b/config/jobs/kubernetes/sig-cloud-provider/azure/generate.sh
@@ -38,7 +38,7 @@ EOF
 }
 
 # we need to define the full image URL so it can be autobumped
-tmp="gcr.io/k8s-testimages/kubekins-e2e:v20210707-0f9c540-master"
+tmp="gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master"
 kubekins_e2e_image="${tmp/\-master/}"
 
 for release in "$@"; do
@@ -81,7 +81,7 @@ presubmits:
         path_alias: sigs.k8s.io/azuredisk-csi-driver
     spec:
       containers:
-        - image: ${kubekins_e2e_image}-${release}
+        - image: ${kubekins_e2e_image}-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -126,7 +126,7 @@ $(generate_presubmit_annotations ${branch} pull-kubernetes-e2e-capz-azure-disk)
         path_alias: sigs.k8s.io/azuredisk-csi-driver
     spec:
       containers:
-        - image: ${kubekins_e2e_image}-${release}
+        - image: ${kubekins_e2e_image}-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -173,7 +173,7 @@ $(generate_presubmit_annotations ${branch} pull-kubernetes-e2e-capz-azure-disk-v
         path_alias: sigs.k8s.io/azurefile-csi-driver
     spec:
       containers:
-        - image: ${kubekins_e2e_image}-${release}
+        - image: ${kubekins_e2e_image}-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -219,7 +219,7 @@ $(generate_presubmit_annotations ${branch} pull-kubernetes-e2e-capz-azure-file)
         path_alias: sigs.k8s.io/azurefile-csi-driver
     spec:
       containers:
-        - image: ${kubekins_e2e_image}-${release}
+        - image: ${kubekins_e2e_image}-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -263,7 +263,7 @@ $(generate_presubmit_annotations ${branch} pull-kubernetes-e2e-capz-azure-file-v
       workdir: true
     spec:
       containers:
-      - image: ${kubekins_e2e_image}-${release}
+      - image: ${kubekins_e2e_image}-master
         command:
         - runner.sh
         - ./scripts/ci-conformance.sh
@@ -301,7 +301,7 @@ $(generate_presubmit_annotations ${branch} pull-kubernetes-e2e-capz-conformance)
       workdir: true
     spec:
       containers:
-      - image: ${kubekins_e2e_image}-${release}
+      - image: ${kubekins_e2e_image}-master
         command:
         - runner.sh
         - ./scripts/ci-conformance.sh

diff --git a/config/jobs/kubernetes/sig-cloud-provider/azure/release-1.18.yaml b/config/jobs/kubernetes/sig-cloud-provider/azure/release-1.18.yaml
@@ -26,7 +26,7 @@ presubmits:
         path_alias: sigs.k8s.io/azuredisk-csi-driver
     spec:
       containers:
-        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.18
+        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -71,7 +71,7 @@ presubmits:
         path_alias: sigs.k8s.io/azuredisk-csi-driver
     spec:
       containers:
-        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.18
+        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -118,7 +118,7 @@ presubmits:
         path_alias: sigs.k8s.io/azurefile-csi-driver
     spec:
       containers:
-        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.18
+        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -164,7 +164,7 @@ presubmits:
         path_alias: sigs.k8s.io/azurefile-csi-driver
     spec:
       containers:
-        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.18
+        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -208,7 +208,7 @@ presubmits:
       workdir: true
     spec:
       containers:
-      - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.18
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
         command:
         - runner.sh
         - ./scripts/ci-conformance.sh
@@ -246,7 +246,7 @@ presubmits:
       workdir: true
     spec:
       containers:
-      - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.18
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
         command:
         - runner.sh
         - ./scripts/ci-conformance.sh

diff --git a/config/jobs/kubernetes/sig-cloud-provider/azure/release-1.19.yaml b/config/jobs/kubernetes/sig-cloud-provider/azure/release-1.19.yaml
@@ -26,7 +26,7 @@ presubmits:
         path_alias: sigs.k8s.io/azuredisk-csi-driver
     spec:
       containers:
-        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.19
+        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -71,7 +71,7 @@ presubmits:
         path_alias: sigs.k8s.io/azuredisk-csi-driver
     spec:
       containers:
-        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.19
+        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -118,7 +118,7 @@ presubmits:
         path_alias: sigs.k8s.io/azurefile-csi-driver
     spec:
       containers:
-        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.19
+        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -164,7 +164,7 @@ presubmits:
         path_alias: sigs.k8s.io/azurefile-csi-driver
     spec:
       containers:
-        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.19
+        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -208,7 +208,7 @@ presubmits:
       workdir: true
     spec:
       containers:
-      - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.19
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
         command:
         - runner.sh
         - ./scripts/ci-conformance.sh
@@ -246,7 +246,7 @@ presubmits:
       workdir: true
     spec:
       containers:
-      - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.19
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
         command:
         - runner.sh
         - ./scripts/ci-conformance.sh

diff --git a/config/jobs/kubernetes/sig-cloud-provider/azure/release-1.20.yaml b/config/jobs/kubernetes/sig-cloud-provider/azure/release-1.20.yaml
@@ -26,7 +26,7 @@ presubmits:
         path_alias: sigs.k8s.io/azuredisk-csi-driver
     spec:
       containers:
-        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.20
+        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -71,7 +71,7 @@ presubmits:
         path_alias: sigs.k8s.io/azuredisk-csi-driver
     spec:
       containers:
-        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.20
+        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -118,7 +118,7 @@ presubmits:
         path_alias: sigs.k8s.io/azurefile-csi-driver
     spec:
       containers:
-        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.20
+        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -164,7 +164,7 @@ presubmits:
         path_alias: sigs.k8s.io/azurefile-csi-driver
     spec:
       containers:
-        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.20
+        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -208,7 +208,7 @@ presubmits:
       workdir: true
     spec:
       containers:
-      - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.20
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
         command:
         - runner.sh
         - ./scripts/ci-conformance.sh
@@ -246,7 +246,7 @@ presubmits:
       workdir: true
     spec:
       containers:
-      - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.20
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
         command:
         - runner.sh
         - ./scripts/ci-conformance.sh

diff --git a/config/jobs/kubernetes/sig-cloud-provider/azure/release-1.21.yaml b/config/jobs/kubernetes/sig-cloud-provider/azure/release-1.21.yaml
@@ -26,7 +26,7 @@ presubmits:
         path_alias: sigs.k8s.io/azuredisk-csi-driver
     spec:
       containers:
-        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.21
+        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -71,7 +71,7 @@ presubmits:
         path_alias: sigs.k8s.io/azuredisk-csi-driver
     spec:
       containers:
-        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.21
+        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -118,7 +118,7 @@ presubmits:
         path_alias: sigs.k8s.io/azurefile-csi-driver
     spec:
       containers:
-        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.21
+        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -164,7 +164,7 @@ presubmits:
         path_alias: sigs.k8s.io/azurefile-csi-driver
     spec:
       containers:
-        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.21
+        - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
           command:
             - runner.sh
             - ./scripts/ci-entrypoint.sh
@@ -208,7 +208,7 @@ presubmits:
       workdir: true
     spec:
       containers:
-      - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.21
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
         command:
         - runner.sh
         - ./scripts/ci-conformance.sh
@@ -246,7 +246,7 @@ presubmits:
       workdir: true
     spec:
       containers:
-      - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-1.21
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20210709-09116fb-master
         command:
         - runner.sh
         - ./scripts/ci-conformance.sh