From 766c091738ce315187ff72759a287c05bf200f59 Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Tue, 8 Jun 2021 14:29:30 -0700 Subject: [PATCH 1/2] Add windows k8s upstream CI presubmitt --- ...cluster-api-provider-azure-presubmits.yaml | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/config/jobs/kubernetes-sigs/cluster-api-provider-azure/cluster-api-provider-azure-presubmits.yaml b/config/jobs/kubernetes-sigs/cluster-api-provider-azure/cluster-api-provider-azure-presubmits.yaml index 7fab41a28bc5..563d25bb9a73 100644 --- a/config/jobs/kubernetes-sigs/cluster-api-provider-azure/cluster-api-provider-azure-presubmits.yaml +++ b/config/jobs/kubernetes-sigs/cluster-api-provider-azure/cluster-api-provider-azure-presubmits.yaml @@ -286,6 +286,44 @@ presubmits: annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-provider-azure testgrid-tab-name: capz-pr-conformance-v1alpha4-k8s-main + - name: pull-cluster-api-provider-azure-windows-upstream-with-ci-artifacts + path_alias: "sigs.k8s.io/cluster-api-provider-azure" + always_run: false + optional: true + decorate: true + decoration_config: + timeout: 4h + max_concurrency: 5 + labels: + preset-dind-enabled: "true" + preset-kind-volume-mounts: "true" + preset-azure-cred-only: "true" + branches: + # The script this job runs is not in all branches. + - ^master$ + spec: + containers: + - image: gcr.io/k8s-testimages/kubekins-e2e:v20210601-ea6aa4e-go-canary + command: + - "runner.sh" + - "./scripts/ci-conformance.sh" + env: + - name: E2E_ARGS + value: "-kubetest.use-ci-artifacts" + - name: WINDOWS + value: "true" + # Windows isn't really conformance, we typically run at 4 to keep the time reasonable (~45 mins) + - name: CONFORMANCE_NODES + value: "4" + securityContext: + privileged: true + resources: + requests: + cpu: 2 + memory: "9Gi" + annotations: + testgrid-dashboards: sig-cluster-lifecycle-cluster-api-provider-azure + testgrid-tab-name: capz-pull-upstream-v1alpha4-k8s-main-windows - name: pull-cluster-api-provider-azure-apidiff decorate: true path_alias: sigs.k8s.io/cluster-api-provider-azure From df764046472ee500404757b9db6eff5160f8b7e7 Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Tue, 8 Jun 2021 15:35:00 -0700 Subject: [PATCH 2/2] building on main branch requires correct repolist --- .../cluster-api-provider-azure-presubmits.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/jobs/kubernetes-sigs/cluster-api-provider-azure/cluster-api-provider-azure-presubmits.yaml b/config/jobs/kubernetes-sigs/cluster-api-provider-azure/cluster-api-provider-azure-presubmits.yaml index 563d25bb9a73..0b4c19f321aa 100644 --- a/config/jobs/kubernetes-sigs/cluster-api-provider-azure/cluster-api-provider-azure-presubmits.yaml +++ b/config/jobs/kubernetes-sigs/cluster-api-provider-azure/cluster-api-provider-azure-presubmits.yaml @@ -315,6 +315,8 @@ presubmits: # Windows isn't really conformance, we typically run at 4 to keep the time reasonable (~45 mins) - name: CONFORMANCE_NODES value: "4" + - name: WIN_REPO_LIST + value: https://raw.githubusercontent.com/kubernetes-sigs/windows-testing/master/images/image-repo-list-master securityContext: privileged: true resources: