From bb52e7e411737a734a4e4514c735f6126b18ab4f Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Wed, 8 Jan 2025 10:34:03 -0800 Subject: [PATCH 1/2] Move windows 1.32 jobs to windows dashboard Signed-off-by: James Sturtevant --- .../release-1.32-windows-presubmits.yaml | 55 +++++++++ .../sig-windows/release-1.32-windows.yaml | 107 ++++++++++++++++++ .../sig-release/release-branch-jobs/1.32.yaml | 104 ----------------- .../kubernetes/sig-windows/config.yaml | 2 + 4 files changed, 164 insertions(+), 104 deletions(-) create mode 100644 config/jobs/kubernetes-sigs/sig-windows/release-1.32-windows-presubmits.yaml create mode 100644 config/jobs/kubernetes-sigs/sig-windows/release-1.32-windows.yaml diff --git a/config/jobs/kubernetes-sigs/sig-windows/release-1.32-windows-presubmits.yaml b/config/jobs/kubernetes-sigs/sig-windows/release-1.32-windows-presubmits.yaml new file mode 100644 index 000000000000..52ee2f1b484d --- /dev/null +++ b/config/jobs/kubernetes-sigs/sig-windows/release-1.32-windows-presubmits.yaml @@ -0,0 +1,55 @@ +presubmits: + kubernetes/kubernetes: + - name: pull-kubernetes-e2e-capz-windows-1-32 + cluster: eks-prow-build-cluster + always_run: false + branches: + - release-1.32 + decorate: true + extra_refs: + - base_ref: release-1.16 + org: kubernetes-sigs + path_alias: sigs.k8s.io/cluster-api-provider-azure + repo: cluster-api-provider-azure + workdir: false + - base_ref: master + org: kubernetes-sigs + path_alias: sigs.k8s.io/cloud-provider-azure + repo: cloud-provider-azure + - org: kubernetes-sigs + repo: windows-testing + base_ref: master + path_alias: k8s.io/windows-testing + workdir: true + labels: + preset-azure-community: "true" + preset-capz-containerd-1-7-latest: "true" + preset-capz-windows-2022: "true" + preset-capz-windows-common-pull: "true" + preset-dind-enabled: "true" + optional: true + path_alias: k8s.io/kubernetes + run_if_changed: azure.*\.go$|.*windows\.go$|test/e2e/windows/.* + spec: + serviceAccountName: azure + containers: + - command: + - "runner.sh" + - "env" + - KUBERNETES_VERSION=latest-1.32 + - "./capz/run-capz-e2e.sh" + image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241230-3006692a6f-1.32 + name: "" + resources: + requests: + cpu: "2" + memory: "9Gi" + limits: + cpu: "2" + memory: "9Gi" + securityContext: + privileged: true + annotations: + testgrid-dashboards: sig-windows-presubmit + testgrid-tab-name: pull-kubernetes-e2e-capz-windows-1-32 + testgrid-num-columns-recent: '30' diff --git a/config/jobs/kubernetes-sigs/sig-windows/release-1.32-windows.yaml b/config/jobs/kubernetes-sigs/sig-windows/release-1.32-windows.yaml new file mode 100644 index 000000000000..4d6f835cabd7 --- /dev/null +++ b/config/jobs/kubernetes-sigs/sig-windows/release-1.32-windows.yaml @@ -0,0 +1,107 @@ +periodics: +- name: ci-kubernetes-e2e-capz-master-windows-1-32 + annotations: + testgrid-alert-email: kubernetes-provider-azure@googlegroups.com, sig-windows-leads@kubernetes.io + testgrid-dashboards: sig-release-1.32-informing, sig-windows-1.32, sig-windows-signal + testgrid-tab-name: capz-windows-1.32 + cluster: eks-prow-build-cluster + decorate: true + decoration_config: + timeout: 4h0m0s + extra_refs: + - base_ref: main + org: kubernetes-sigs + path_alias: sigs.k8s.io/cluster-api-provider-azure + repo: cluster-api-provider-azure + - base_ref: master + org: kubernetes-sigs + path_alias: sigs.k8s.io/windows-testing + repo: windows-testing + workdir: true + - base_ref: master + org: kubernetes-sigs + path_alias: sigs.k8s.io/cloud-provider-azure + repo: cloud-provider-azure + interval: 12h + labels: + preset-azure-community: "true" + preset-capz-containerd-1-7-latest: "true" + preset-capz-windows-2022: "true" + preset-capz-windows-common: "true" + preset-dind-enabled: "true" + preset-kind-volume-mounts: "true" + spec: + serviceAccountName: azure + containers: + - command: + - runner.sh + - env + - KUBERNETES_VERSION=latest-1.32 + - ./capz/run-capz-e2e.sh + image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241230-3006692a6f-1.32 + name: "" + resources: + limits: + cpu: "2" + memory: 9Gi + requests: + cpu: "2" + memory: 9Gi + securityContext: + privileged: true +- name: ci-kubernetes-e2e-capz-1-32-windows-serial-slow + cluster: eks-prow-build-cluster + interval: 48h + decorate: true + decoration_config: + timeout: 5h + labels: + preset-dind-enabled: "true" + preset-azure-community: "true" + preset-capz-containerd-1-7-latest: "true" + preset-capz-serial-slow: "true" + preset-capz-gmsa-setup: "true" + preset-capz-windows-2022: "true" + extra_refs: + - org: kubernetes-sigs + repo: cluster-api-provider-azure + base_ref: release-1.16 + path_alias: sigs.k8s.io/cluster-api-provider-azure + workdir: false + - org: kubernetes-sigs + repo: windows-testing + base_ref: master + path_alias: sigs.k8s.io/windows-testing + workdir: true + - org: kubernetes-sigs + repo: cloud-provider-azure + base_ref: master + path_alias: sigs.k8s.io/cloud-provider-azure + workdir: false + spec: + serviceAccountName: azure + containers: + - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241230-3006692a6f-1.32 + command: + - "runner.sh" + - "env" + - KUBERNETES_VERSION=latest-1.32 + - "./capz/run-capz-e2e.sh" + securityContext: + privileged: true + resources: + requests: + cpu: 2 + memory: "9Gi" + limits: + cpu: 2 + memory: "9Gi" + env: + - name: GINKGO_FOCUS + value: (\[sig-windows\]|\[sig-scheduling\].SchedulerPreemption|\[sig-apps\].CronJob).*(\[Serial\]|\[Slow\])|(\[Serial\]|\[Slow\]).*(\[Conformance\]|\[NodeConformance\])|\[sig-api-machinery\].Garbage.collector + - name: GINKGO_SKIP + value: \[LinuxOnly\]|device.plugin.for.Windows|\[sig-autoscaling\].\[Feature:HPA\] + annotations: + testgrid-alert-email: kubernetes-provider-azure@googlegroups.com, sig-windows-leads@kubernetes.io + testgrid-dashboards: sig-windows-1.32-release, sig-windows-signal + testgrid-tab-name: capz-windows-1-32-serial-slow diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.32.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.32.yaml index 561cafbb2302..59f99ebe7604 100644 --- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.32.yaml +++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.32.yaml @@ -577,56 +577,6 @@ periodics: memory: 9Gi securityContext: privileged: true -- annotations: - testgrid-alert-email: kubernetes-provider-azure@googlegroups.com, sig-windows-leads@kubernetes.io - testgrid-dashboards: sig-release-1.32-informing, sig-windows-master-release, sig-windows-signal - testgrid-tab-name: capz-windows-1.32 - cluster: eks-prow-build-cluster - decorate: true - decoration_config: - timeout: 4h0m0s - extra_refs: - - base_ref: main - org: kubernetes-sigs - path_alias: sigs.k8s.io/cluster-api-provider-azure - repo: cluster-api-provider-azure - - base_ref: master - org: kubernetes-sigs - path_alias: sigs.k8s.io/windows-testing - repo: windows-testing - workdir: true - - base_ref: master - org: kubernetes-sigs - path_alias: sigs.k8s.io/cloud-provider-azure - repo: cloud-provider-azure - interval: 3h - labels: - preset-azure-community: "true" - preset-capz-containerd-1-7-latest: "true" - preset-capz-windows-2022: "true" - preset-capz-windows-common: "true" - preset-dind-enabled: "true" - preset-kind-volume-mounts: "true" - name: ci-kubernetes-e2e-capz-master-windows-1-32 - spec: - containers: - - command: - - runner.sh - - env - - KUBERNETES_VERSION=latest-1.32 - - ./capz/run-capz-e2e.sh - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250121-4aed057712-1.32 - name: "" - resources: - limits: - cpu: "2" - memory: 9Gi - requests: - cpu: "2" - memory: 9Gi - securityContext: - privileged: true - serviceAccountName: azure postsubmits: {} presubmits: kubernetes/kubernetes: @@ -2231,60 +2181,6 @@ presubmits: requests: cpu: "5" memory: 12Gi - - annotations: - testgrid-dashboards: sig-windows-presubmit - testgrid-tab-name: pull-kubernetes-e2e-capz-windows-1-32 - testgrid-num-columns-recent: '30' - always_run: false - branches: - - release-1.32 - cluster: eks-prow-build-cluster - context: pull-kubernetes-e2e-capz-windows-1-32 - decorate: true - extra_refs: - - base_ref: main - org: kubernetes-sigs - path_alias: sigs.k8s.io/cluster-api-provider-azure - repo: cluster-api-provider-azure - - base_ref: master - org: kubernetes-sigs - path_alias: sigs.k8s.io/cloud-provider-azure - repo: cloud-provider-azure - - base_ref: master - org: kubernetes-sigs - path_alias: k8s.io/windows-testing - repo: windows-testing - workdir: true - labels: - preset-azure-community: "true" - preset-capz-containerd-1-7-latest: "true" - preset-capz-windows-2022: "true" - preset-capz-windows-common-pull: "true" - preset-dind-enabled: "true" - preset-kind-volume-mounts: "true" - name: pull-kubernetes-e2e-capz-windows-1-32 - optional: true - path_alias: k8s.io/kubernetes - run_if_changed: azure.*\.go$|.*windows\.go$|test/e2e/windows/.* - spec: - containers: - - command: - - runner.sh - - env - - KUBERNETES_VERSION=latest-1.32 - - ./capz/run-capz-e2e.sh - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250121-4aed057712-1.32 - name: "" - resources: - limits: - cpu: "2" - memory: 9Gi - requests: - cpu: "2" - memory: 9Gi - securityContext: - privileged: true - serviceAccountName: azure kubernetes/perf-tests: - always_run: false branches: diff --git a/config/testgrids/kubernetes/sig-windows/config.yaml b/config/testgrids/kubernetes/sig-windows/config.yaml index c3f59f26d7cb..a7206064d3a4 100644 --- a/config/testgrids/kubernetes/sig-windows/config.yaml +++ b/config/testgrids/kubernetes/sig-windows/config.yaml @@ -5,6 +5,7 @@ dashboard_groups: - sig-windows-1.29-release - sig-windows-1.30-release - sig-windows-1.31-release + - sig-windows-1.32-release - sig-windows-master-release - sig-windows-presubmit - sig-windows-networking @@ -17,6 +18,7 @@ dashboards: - name: sig-windows-1.29-release - name: sig-windows-1.30-release - name: sig-windows-1.31-release +- name: sig-windows-1.32-release - name: sig-windows-master-release - name: sig-windows-presubmit - name: sig-windows-push-images From 08c6e53340341ed4bc17be41f7eddbdcdc07617d Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Wed, 8 Jan 2025 10:49:23 -0800 Subject: [PATCH 2/2] Fix dashboard name Signed-off-by: James Sturtevant --- .../jobs/kubernetes-sigs/sig-windows/release-1.32-windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/jobs/kubernetes-sigs/sig-windows/release-1.32-windows.yaml b/config/jobs/kubernetes-sigs/sig-windows/release-1.32-windows.yaml index 4d6f835cabd7..1f09cf9243f9 100644 --- a/config/jobs/kubernetes-sigs/sig-windows/release-1.32-windows.yaml +++ b/config/jobs/kubernetes-sigs/sig-windows/release-1.32-windows.yaml @@ -2,7 +2,7 @@ periodics: - name: ci-kubernetes-e2e-capz-master-windows-1-32 annotations: testgrid-alert-email: kubernetes-provider-azure@googlegroups.com, sig-windows-leads@kubernetes.io - testgrid-dashboards: sig-release-1.32-informing, sig-windows-1.32, sig-windows-signal + testgrid-dashboards: sig-release-1.32-informing, sig-windows-1.32-release, sig-windows-signal testgrid-tab-name: capz-windows-1.32 cluster: eks-prow-build-cluster decorate: true