From cf4afa8cb798fbce59c97914bdf3b70802110e81 Mon Sep 17 00:00:00 2001 From: Ernest Wong Date: Mon, 12 Jul 2021 11:56:39 -0700 Subject: [PATCH] azure: use kubekins-e2e master instead of release branches Signed-off-by: Ernest Wong --- .../sig-cloud-provider/azure/generate.sh | 14 +++++++------- .../sig-cloud-provider/azure/release-1.18.yaml | 12 ++++++------ .../sig-cloud-provider/azure/release-1.19.yaml | 12 ++++++------ .../sig-cloud-provider/azure/release-1.20.yaml | 12 ++++++------ .../sig-cloud-provider/azure/release-1.21.yaml | 12 ++++++------ 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/config/jobs/kubernetes/sig-cloud-provider/azure/generate.sh b/config/jobs/kubernetes/sig-cloud-provider/azure/generate.sh index 2d8a45385844..f45cd2ab2bec 100755 --- 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 index 685b143d12b2..89481e42d934 100644 --- 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 index 2165378cc507..0e4f0f4cc507 100644 --- 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 index 5c1b5c7fd557..7ac10a776afb 100644 --- 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 index ca6b15011437..8fb58478a15d 100644 --- 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