From 4c6e1fb52cbbd1bb4bb0079d4b5d8ea4ef466327 Mon Sep 17 00:00:00 2001 From: Jack Date: Wed, 9 Feb 2022 13:20:34 -0800 Subject: [PATCH] azure: use correct capz release branches for cloud-provider-azure tests --- .../azure/release-1.20.yaml | 10 +- .../azure/release-1.21.yaml | 10 +- .../azure/release-1.22.yaml | 10 +- .../azure/release-1.23.yaml | 10 +- .../azure/release-master.yaml | 249 ++++++++++++++++++ 5 files changed, 269 insertions(+), 20 deletions(-) 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 3e7e8b4954c0f..0b885b3a59b77 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 @@ -277,7 +277,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure spec: containers: @@ -316,7 +316,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure - org: kubernetes-sigs repo: azurefile-csi-driver @@ -368,7 +368,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure - org: kubernetes-sigs repo: azurefile-csi-driver @@ -422,7 +422,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure - org: kubernetes-sigs repo: azuredisk-csi-driver @@ -473,7 +473,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure - org: kubernetes-sigs repo: azuredisk-csi-driver 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 6b37e1004695d..93a017bd33e3e 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 @@ -277,7 +277,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure spec: containers: @@ -316,7 +316,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure - org: kubernetes-sigs repo: azurefile-csi-driver @@ -368,7 +368,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure - org: kubernetes-sigs repo: azurefile-csi-driver @@ -422,7 +422,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure - org: kubernetes-sigs repo: azuredisk-csi-driver @@ -473,7 +473,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure - org: kubernetes-sigs repo: azuredisk-csi-driver diff --git a/config/jobs/kubernetes/sig-cloud-provider/azure/release-1.22.yaml b/config/jobs/kubernetes/sig-cloud-provider/azure/release-1.22.yaml index 9365cecabe3b1..bebc6fa345c1b 100644 --- a/config/jobs/kubernetes/sig-cloud-provider/azure/release-1.22.yaml +++ b/config/jobs/kubernetes/sig-cloud-provider/azure/release-1.22.yaml @@ -277,7 +277,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure spec: containers: @@ -316,7 +316,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure - org: kubernetes-sigs repo: azurefile-csi-driver @@ -368,7 +368,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure - org: kubernetes-sigs repo: azurefile-csi-driver @@ -422,7 +422,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure - org: kubernetes-sigs repo: azuredisk-csi-driver @@ -473,7 +473,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure - org: kubernetes-sigs repo: azuredisk-csi-driver diff --git a/config/jobs/kubernetes/sig-cloud-provider/azure/release-1.23.yaml b/config/jobs/kubernetes/sig-cloud-provider/azure/release-1.23.yaml index c5e7c84fb7e51..0fcfc525fa863 100644 --- a/config/jobs/kubernetes/sig-cloud-provider/azure/release-1.23.yaml +++ b/config/jobs/kubernetes/sig-cloud-provider/azure/release-1.23.yaml @@ -277,7 +277,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure spec: containers: @@ -316,7 +316,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure - org: kubernetes-sigs repo: azurefile-csi-driver @@ -368,7 +368,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure - org: kubernetes-sigs repo: azurefile-csi-driver @@ -422,7 +422,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure - org: kubernetes-sigs repo: azuredisk-csi-driver @@ -473,7 +473,7 @@ periodics: extra_refs: - org: kubernetes-sigs repo: cluster-api-provider-azure - base_ref: main + base_ref: release-1.1 path_alias: sigs.k8s.io/cluster-api-provider-azure - org: kubernetes-sigs repo: azuredisk-csi-driver diff --git a/config/jobs/kubernetes/sig-cloud-provider/azure/release-master.yaml b/config/jobs/kubernetes/sig-cloud-provider/azure/release-master.yaml index e235df5bf77c2..27983f2dd791e 100644 --- a/config/jobs/kubernetes/sig-cloud-provider/azure/release-master.yaml +++ b/config/jobs/kubernetes/sig-cloud-provider/azure/release-master.yaml @@ -543,3 +543,252 @@ periodics: testgrid-tab-name: capz-azure-disk-vmss testgrid-alert-email: kubernetes-provider-azure@googlegroups.com testgrid-num-columns-recent: '30' +# the "capz-release-*" jobs below validate the health of cloud-provider-azure:master against the latest stable release of capz +- interval: 3h + name: capz-release-1.1-conformance-master + decorate: true + decoration_config: + timeout: 3h + labels: + preset-dind-enabled: "true" + preset-kind-volume-mounts: "true" + preset-azure-cred-only: "true" + extra_refs: + - org: kubernetes-sigs + repo: cluster-api-provider-azure + base_ref: release-1.1 + path_alias: sigs.k8s.io/cluster-api-provider-azure + spec: + containers: + - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20220124-681f3531ec-master + command: + - runner.sh + - ./scripts/ci-conformance.sh + env: + - name: E2E_ARGS + value: "-kubetest.use-ci-artifacts" + - name: KUBERNETES_VERSION + value: "latest" + - name: CONFORMANCE_WORKER_MACHINE_COUNT + value: "2" + securityContext: + privileged: true + resources: + requests: + cpu: 1 + memory: "4Gi" + annotations: + testgrid-dashboards: provider-azure-master-signal + testgrid-tab-name: capz-conformance + testgrid-alert-email: kubernetes-provider-azure@googlegroups.com + testgrid-num-columns-recent: '30' + +- interval: 24h + name: capz-release-1.1-azure-file-master + decorate: true + decoration_config: + timeout: 3h + labels: + preset-dind-enabled: "true" + preset-kind-volume-mounts: "true" + preset-azure-cred: "true" + extra_refs: + - org: kubernetes-sigs + repo: cluster-api-provider-azure + base_ref: release-1.1 + path_alias: sigs.k8s.io/cluster-api-provider-azure + - org: kubernetes-sigs + repo: azurefile-csi-driver + base_ref: master + path_alias: sigs.k8s.io/azurefile-csi-driver + - org: kubernetes + repo: kubernetes + base_ref: master + path_alias: k8s.io/kubernetes + spec: + containers: + - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20220124-681f3531ec-master + command: + - runner.sh + - ./scripts/ci-entrypoint.sh + args: + - bash + - -c + - >- + kubectl apply -f templates/addons/azurefile-role.yaml && + cd ${GOPATH}/src/sigs.k8s.io/azurefile-csi-driver && ./deploy/install-driver.sh master local,snapshot,enable-avset && + make e2e-test + env: + - name: USE_CI_ARTIFACTS + value: "true" + - name: AZURE_STORAGE_DRIVER + value: kubernetes.io/azure-file # In-tree Azure file storage class + securityContext: + privileged: true + resources: + requests: + cpu: 1 + memory: "4Gi" + annotations: + testgrid-dashboards: provider-azure-master-signal + testgrid-tab-name: capz-azure-file + testgrid-alert-email: kubernetes-provider-azure@googlegroups.com + testgrid-num-columns-recent: '30' + +- interval: 24h + name: capz-release-1.1-azure-file-vmss-master + decorate: true + decoration_config: + timeout: 3h + labels: + preset-dind-enabled: "true" + preset-kind-volume-mounts: "true" + preset-azure-cred: "true" + extra_refs: + - org: kubernetes-sigs + repo: cluster-api-provider-azure + base_ref: release-1.1 + path_alias: sigs.k8s.io/cluster-api-provider-azure + - org: kubernetes-sigs + repo: azurefile-csi-driver + base_ref: master + path_alias: sigs.k8s.io/azurefile-csi-driver + - org: kubernetes + repo: kubernetes + base_ref: master + path_alias: k8s.io/kubernetes + spec: + containers: + - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20220124-681f3531ec-master + command: + - runner.sh + - ./scripts/ci-entrypoint.sh + args: + - bash + - -c + - >- + kubectl apply -f templates/addons/azurefile-role.yaml && + cd ${GOPATH}/src/sigs.k8s.io/azurefile-csi-driver && ./deploy/install-driver.sh master local,snapshot,enable-avset && + make e2e-test + env: + - name: USE_CI_ARTIFACTS + value: "true" + - name: EXP_MACHINE_POOL + value: "true" + - name: AZURE_STORAGE_DRIVER + value: kubernetes.io/azure-file # In-tree Azure file storage class + securityContext: + privileged: true + resources: + requests: + cpu: 1 + memory: "4Gi" + annotations: + testgrid-dashboards: provider-azure-master-signal + testgrid-tab-name: capz-azure-file-vmss + testgrid-alert-email: kubernetes-provider-azure@googlegroups.com + testgrid-num-columns-recent: '30' + +- interval: 24h + name: capz-release-1.1-azure-disk-master + decorate: true + decoration_config: + timeout: 3h + labels: + preset-dind-enabled: "true" + preset-kind-volume-mounts: "true" + preset-azure-cred: "true" + extra_refs: + - org: kubernetes-sigs + repo: cluster-api-provider-azure + base_ref: release-1.1 + path_alias: sigs.k8s.io/cluster-api-provider-azure + - org: kubernetes-sigs + repo: azuredisk-csi-driver + base_ref: master + path_alias: sigs.k8s.io/azuredisk-csi-driver + - org: kubernetes + repo: kubernetes + base_ref: master + path_alias: k8s.io/kubernetes + spec: + containers: + - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20220124-681f3531ec-master + command: + - runner.sh + - ./scripts/ci-entrypoint.sh + args: + - bash + - -c + - >- + cd ${GOPATH}/src/sigs.k8s.io/azuredisk-csi-driver && ./deploy/install-driver.sh master local,snapshot,enable-avset && + make e2e-test + env: + - name: USE_CI_ARTIFACTS + value: "true" + - name: AZURE_STORAGE_DRIVER + value: kubernetes.io/azure-disk # In-tree Azure disk storage class + securityContext: + privileged: true + resources: + requests: + cpu: 1 + memory: "4Gi" + annotations: + testgrid-dashboards: provider-azure-master-signal + testgrid-tab-name: capz-azure-disk + testgrid-alert-email: kubernetes-provider-azure@googlegroups.com + testgrid-num-columns-recent: '30' + +- interval: 24h + name: capz-release-1.1-azure-disk-vmss-master + decorate: true + decoration_config: + timeout: 3h + labels: + preset-dind-enabled: "true" + preset-kind-volume-mounts: "true" + preset-azure-cred: "true" + extra_refs: + - org: kubernetes-sigs + repo: cluster-api-provider-azure + base_ref: release-1.1 + path_alias: sigs.k8s.io/cluster-api-provider-azure + - org: kubernetes-sigs + repo: azuredisk-csi-driver + base_ref: master + path_alias: sigs.k8s.io/azuredisk-csi-driver + - org: kubernetes + repo: kubernetes + base_ref: master + path_alias: k8s.io/kubernetes + spec: + containers: + - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20220124-681f3531ec-master + command: + - runner.sh + - ./scripts/ci-entrypoint.sh + args: + - bash + - -c + - >- + cd ${GOPATH}/src/sigs.k8s.io/azuredisk-csi-driver && ./deploy/install-driver.sh master local,snapshot,enable-avset && + make e2e-test + env: + - name: USE_CI_ARTIFACTS + value: "true" + - name: EXP_MACHINE_POOL + value: "true" + - name: AZURE_STORAGE_DRIVER + value: kubernetes.io/azure-disk # In-tree Azure disk storage class + securityContext: + privileged: true + resources: + requests: + cpu: 1 + memory: "4Gi" + annotations: + testgrid-dashboards: provider-azure-master-signal + testgrid-tab-name: capz-azure-disk-vmss + testgrid-alert-email: kubernetes-provider-azure@googlegroups.com + testgrid-num-columns-recent: '30'