Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

azure: use correct capz release branches for cloud-provider-azure tests #25193

Merged
merged 1 commit into from
Feb 10, 2022
Merged

azure: use correct capz release branches for cloud-provider-azure tests #25193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
276 changes: 266 additions & 10 deletions config/jobs/kubernetes/sig-cloud-provider/azure/generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,17 @@ installCSIdrivers=""
for release in "$@"; do
output="${dir}/release-${release}.yaml"
kubernetes_version="latest"
latest_capz_release="release-1.1"

if [[ "${release}" == "master" ]]; then
branch=$(echo -e 'master # TODO(releng): Remove once repo default branch has been renamed\n - main')
branch_name="master"
capz_periodic_branch_name="main"
else
branch="release-${release}"
branch_name="release-${release}"
kubernetes_version+="-${release}"
capz_periodic_branch_name=${latest_capz_release}
fi

if [[ "${release}" == "master" || "${release}" == "1.23" ]]; then
Expand All @@ -79,7 +82,7 @@ presubmits:
extra_refs:
- org: kubernetes-sigs
repo: cluster-api-provider-azure
base_ref: release-1.1
base_ref: ${latest_capz_release}
path_alias: sigs.k8s.io/cluster-api-provider-azure
workdir: true
- org: kubernetes-sigs
Expand Down Expand Up @@ -124,7 +127,7 @@ $(generate_presubmit_annotations ${branch_name} pull-kubernetes-e2e-capz-azure-d
extra_refs:
- org: kubernetes-sigs
repo: cluster-api-provider-azure
base_ref: release-1.1
base_ref: ${latest_capz_release}
path_alias: sigs.k8s.io/cluster-api-provider-azure
workdir: true
- org: kubernetes-sigs
Expand Down Expand Up @@ -171,7 +174,7 @@ $(generate_presubmit_annotations ${branch_name} pull-kubernetes-e2e-capz-azure-d
extra_refs:
- org: kubernetes-sigs
repo: cluster-api-provider-azure
base_ref: release-1.1
base_ref: ${latest_capz_release}
path_alias: sigs.k8s.io/cluster-api-provider-azure
workdir: true
- org: kubernetes-sigs
Expand Down Expand Up @@ -217,7 +220,7 @@ $(generate_presubmit_annotations ${branch_name} pull-kubernetes-e2e-capz-azure-f
extra_refs:
- org: kubernetes-sigs
repo: cluster-api-provider-azure
base_ref: release-1.1
base_ref: ${latest_capz_release}
path_alias: sigs.k8s.io/cluster-api-provider-azure
workdir: true
- org: kubernetes-sigs
Expand Down Expand Up @@ -265,7 +268,7 @@ $(generate_presubmit_annotations ${branch_name} pull-kubernetes-e2e-capz-azure-f
extra_refs:
- org: kubernetes-sigs
repo: cluster-api-provider-azure
base_ref: release-1.1
base_ref: ${latest_capz_release}
path_alias: sigs.k8s.io/cluster-api-provider-azure
workdir: true
spec:
Expand Down Expand Up @@ -339,7 +342,7 @@ periodics:
extra_refs:
- org: kubernetes-sigs
repo: cluster-api-provider-azure
base_ref: main
base_ref: ${capz_periodic_branch_name}
path_alias: sigs.k8s.io/cluster-api-provider-azure
spec:
containers:
Expand Down Expand Up @@ -378,7 +381,7 @@ periodics:
extra_refs:
- org: kubernetes-sigs
repo: cluster-api-provider-azure
base_ref: main
base_ref: ${capz_periodic_branch_name}
path_alias: sigs.k8s.io/cluster-api-provider-azure
- org: kubernetes-sigs
repo: azurefile-csi-driver
Expand Down Expand Up @@ -430,7 +433,7 @@ periodics:
extra_refs:
- org: kubernetes-sigs
repo: cluster-api-provider-azure
base_ref: main
base_ref: ${capz_periodic_branch_name}
path_alias: sigs.k8s.io/cluster-api-provider-azure
- org: kubernetes-sigs
repo: azurefile-csi-driver
Expand Down Expand Up @@ -484,7 +487,7 @@ periodics:
extra_refs:
- org: kubernetes-sigs
repo: cluster-api-provider-azure
base_ref: main
base_ref: ${capz_periodic_branch_name}
path_alias: sigs.k8s.io/cluster-api-provider-azure
- org: kubernetes-sigs
repo: azuredisk-csi-driver
Expand Down Expand Up @@ -535,7 +538,7 @@ periodics:
extra_refs:
- org: kubernetes-sigs
repo: cluster-api-provider-azure
base_ref: main
base_ref: ${capz_periodic_branch_name}
path_alias: sigs.k8s.io/cluster-api-provider-azure
- org: kubernetes-sigs
repo: azuredisk-csi-driver
Expand Down Expand Up @@ -576,4 +579,257 @@ periodics:
testgrid-alert-email: [email protected]
testgrid-num-columns-recent: '30'
EOF
if [[ "${release}" == "master" ]]; then
cat >>"${output}" <<EOF
# the "capz-latest-release-*" jobs below validate the health of cloud-provider-azure:master against the latest stable release of capz
- interval: 24h
name: capz-latest-release-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: ${latest_capz_release}
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-latest-release-conformance
testgrid-alert-email: [email protected]
testgrid-num-columns-recent: '30'

- interval: 24h
name: capz-latest-release-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: ${latest_capz_release}
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-latest-release-azure-file
testgrid-alert-email: [email protected]
testgrid-num-columns-recent: '30'

- interval: 24h
name: capz-latest-release-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: ${latest_capz_release}
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-latest-release-azure-file-vmss
testgrid-alert-email: [email protected]
testgrid-num-columns-recent: '30'

- interval: 24h
name: capz-latest-release-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: ${latest_capz_release}
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-latest-release-azure-disk
testgrid-alert-email: [email protected]
testgrid-num-columns-recent: '30'

- interval: 24h
name: capz-latest-release-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: ${latest_capz_release}
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-latest-release-azure-disk-vmss
testgrid-alert-email: [email protected]
testgrid-num-columns-recent: '30'
EOF
fi
done
Loading