From 19a493ddf7b1ef40417eb809063306aa5ad8a898 Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Mon, 29 Nov 2021 13:06:53 -0800 Subject: [PATCH] windows 1.23 job updates --- .../kubernetes-sigs/sig-windows/README.md | 4 +- .../sig-windows/generate-presubmits.sh | 5 +- .../release-1.23-windows-presubmits.yaml | 222 ++++++++++++++++++ .../sig-windows/release-1.23-windows.yaml | 110 +++++++++ .../sig-release/release-branch-jobs/1.23.yaml | 55 ----- .../kubernetes/sig-windows/config.yaml | 2 + 6 files changed, 340 insertions(+), 58 deletions(-) create mode 100644 config/jobs/kubernetes-sigs/sig-windows/release-1.23-windows-presubmits.yaml create mode 100644 config/jobs/kubernetes-sigs/sig-windows/release-1.23-windows.yaml diff --git a/config/jobs/kubernetes-sigs/sig-windows/README.md b/config/jobs/kubernetes-sigs/sig-windows/README.md index d0dc64a253ea..d6b6af07ed5f 100644 --- a/config/jobs/kubernetes-sigs/sig-windows/README.md +++ b/config/jobs/kubernetes-sigs/sig-windows/README.md @@ -2,8 +2,8 @@ Job configurations for https://testgrid.k8s.io/sig-windows. -To generate the presubmit job configurations for 1.20, 1.21, 1.22 and master branch: +To generate the presubmit job configurations for 1.20, 1.21, 1.22, 1.23, and master branch: ```bash -./generate-presubmits.sh 1.20 1.21 1.22 master +./generate-presubmits.sh 1.20 1.21 1.22 1.23 master ``` diff --git a/config/jobs/kubernetes-sigs/sig-windows/generate-presubmits.sh b/config/jobs/kubernetes-sigs/sig-windows/generate-presubmits.sh index ab9564491d43..ef995ca0863c 100755 --- a/config/jobs/kubernetes-sigs/sig-windows/generate-presubmits.sh +++ b/config/jobs/kubernetes-sigs/sig-windows/generate-presubmits.sh @@ -61,9 +61,12 @@ for release in "$@"; do 1.22) containerd_api_model="https://raw.githubusercontent.com/kubernetes-sigs/windows-testing/master/job-templates/kubernetes_containerd_1_22.json" ;; + 1.23) + containerd_api_model="https://raw.githubusercontent.com/kubernetes-sigs/windows-testing/master/job-templates/kubernetes_containerd_1_23.json" + ;; *) branch="master" - orchestrator_release="1.22" + orchestrator_release="1.23" ;; esac diff --git a/config/jobs/kubernetes-sigs/sig-windows/release-1.23-windows-presubmits.yaml b/config/jobs/kubernetes-sigs/sig-windows/release-1.23-windows-presubmits.yaml new file mode 100644 index 000000000000..0c1d10919a7b --- /dev/null +++ b/config/jobs/kubernetes-sigs/sig-windows/release-1.23-windows-presubmits.yaml @@ -0,0 +1,222 @@ +# generated by ./config/jobs/kubernetes-sigs/sig-windows/generate-presubmits.sh. +presubmits: + kubernetes/kubernetes: + - name: pull-kubernetes-e2e-aks-engine-windows-dockershim + always_run: false + optional: true + decorate: true + decoration_config: + timeout: 3h + path_alias: k8s.io/kubernetes + branches: + - release-1.23 + labels: + preset-service-account: "true" + preset-azure-cred: "true" + preset-azure-windows: "true" + preset-windows-repo-list-master: "true" + preset-k8s-ssh: "true" + preset-dind-enabled: "true" + preset-windows-private-registry-cred: "true" + spec: + containers: + - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-1.23 + command: + - runner.sh + - kubetest + args: + # Generic e2e test args + - --test + - --up + - --down + - --build=quick + - --dump=$(ARTIFACTS) + # Azure-specific test args + - --deployment=aksengine + - --provider=skeleton + - --aksengine-admin-username=azureuser + - --aksengine-admin-password=AdminPassw0rd + - --aksengine-creds=$(AZURE_CREDENTIALS) + - --aksengine-download-url=https://aka.ms/aks-engine/aks-engine-k8s-e2e.tar.gz + - --aksengine-public-key=$(K8S_SSH_PUBLIC_KEY_PATH) + - --aksengine-private-key=$(K8S_SSH_PRIVATE_KEY_PATH) + - --aksengine-winZipBuildScript=$(WIN_BUILD) + - --aksengine-orchestratorRelease=1.23 + - --aksengine-template-url=https://raw.githubusercontent.com/kubernetes-sigs/windows-testing/master/job-templates/kubernetes_release_staging.json + - --aksengine-win-binaries + - --aksengine-deploy-custom-k8s + - --aksengine-agentpoolcount=2 + # Specific test args + - --test_args=--node-os-distro=windows --docker-config-file=$(DOCKER_CONFIG_FILE) --ginkgo.focus=\[Conformance\]|\[NodeConformance\]|\[sig-windows\]|\[sig-apps\].CronJob|\[sig-api-machinery\].ResourceQuota|\[sig-network\].EndpointSlice --ginkgo.skip=\[LinuxOnly\]|\[Serial\]|\[Slow\]|\[alpha\]|GMSA|Guestbook.application.should.create.and.stop.a.working.application|device.plugin.for.Windows + - --ginkgo-parallel=4 + securityContext: + privileged: true + + - name: pull-kubernetes-e2e-aks-engine-windows-containerd + always_run: false + optional: true + run_if_changed: 'azure.*\.go$|.*windows\.go$|test/e2e/windows/.*' + decorate: true + decoration_config: + timeout: 3h + path_alias: k8s.io/kubernetes + branches: + - release-1.23 + labels: + preset-service-account: "true" + preset-azure-cred: "true" + preset-azure-windows: "true" + preset-windows-repo-list-master: "true" + preset-k8s-ssh: "true" + preset-dind-enabled: "true" + preset-windows-private-registry-cred: "true" + spec: + containers: + - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-1.23 + command: + - runner.sh + - kubetest + args: + # Generic e2e test args + - --test + - --up + - --down + - --build=quick + - --dump=$(ARTIFACTS) + # Azure-specific test args + - --deployment=aksengine + - --provider=skeleton + - --aksengine-admin-username=azureuser + - --aksengine-admin-password=AdminPassw0rd + - --aksengine-creds=$(AZURE_CREDENTIALS) + - --aksengine-download-url=https://aka.ms/aks-engine/aks-engine-k8s-e2e.tar.gz + - --aksengine-public-key=$(K8S_SSH_PUBLIC_KEY_PATH) + - --aksengine-private-key=$(K8S_SSH_PRIVATE_KEY_PATH) + - --aksengine-winZipBuildScript=$(WIN_BUILD) + - --aksengine-orchestratorRelease=1.23 + - --aksengine-template-url=https://raw.githubusercontent.com/kubernetes-sigs/windows-testing/master/job-templates/kubernetes_containerd_1_23.json + - --aksengine-win-binaries + - --aksengine-deploy-custom-k8s + - --aksengine-agentpoolcount=2 + # Specific test args + - --test_args=--node-os-distro=windows --docker-config-file=$(DOCKER_CONFIG_FILE) --ginkgo.focus=\[Conformance\]|\[NodeConformance\]|\[sig-windows\]|\[sig-apps\].CronJob|\[sig-api-machinery\].ResourceQuota|\[sig-network\].EndpointSlice --ginkgo.skip=\[LinuxOnly\]|\[Serial\]|\[Slow\]|\[alpha\]|GMSA|Guestbook.application.should.create.and.stop.a.working.application|device.plugin.for.Windows + - --ginkgo-parallel=4 + securityContext: + privileged: true + + - name: pull-kubernetes-e2e-aks-engine-azure-disk-windows-dockershim + decorate: true + decoration_config: + timeout: 2h + always_run: false + optional: true + run_if_changed: 'azure.*\.go$' + path_alias: k8s.io/kubernetes + branches: + - release-1.23 + labels: + preset-service-account: "true" + preset-azure-cred: "true" + preset-azure-windows: "true" + preset-k8s-ssh: "true" + preset-dind-enabled: "true" + extra_refs: + - org: kubernetes-sigs + repo: azuredisk-csi-driver + base_ref: master + path_alias: sigs.k8s.io/azuredisk-csi-driver + spec: + containers: + - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-1.23 + command: + - runner.sh + - kubetest + args: + # Generic e2e test args + - --test + - --up + - --down + - --build=quick + - --dump=$(ARTIFACTS) + # Azure-specific test args + - --deployment=aksengine + - --provider=skeleton + - --aksengine-admin-username=azureuser + - --aksengine-admin-password=AdminPassw0rd + - --aksengine-creds=$(AZURE_CREDENTIALS) + - --aksengine-download-url=https://aka.ms/aks-engine/aks-engine-k8s-e2e.tar.gz + - --aksengine-public-key=$(K8S_SSH_PUBLIC_KEY_PATH) + - --aksengine-private-key=$(K8S_SSH_PRIVATE_KEY_PATH) + - --aksengine-winZipBuildScript=$(WIN_BUILD) + - --aksengine-orchestratorRelease=1.23 + - --aksengine-template-url=https://raw.githubusercontent.com/kubernetes-sigs/windows-testing/master/job-templates/kubernetes_in_tree_volume_plugins.json + - --aksengine-win-binaries + - --aksengine-deploy-custom-k8s + - --aksengine-agentpoolcount=2 + # Specific test args + - --test-azure-disk-csi-driver + securityContext: + privileged: true + env: + - name: AZURE_STORAGE_DRIVER + value: kubernetes.io/azure-disk # In-tree Azure disk storage class + - name: TEST_WINDOWS + value: "true" + - name: pull-kubernetes-e2e-aks-engine-azure-file-windows-dockershim + decorate: true + decoration_config: + timeout: 2h + always_run: false + optional: true + run_if_changed: 'azure.*\.go$' + path_alias: k8s.io/kubernetes + branches: + - release-1.23 + labels: + preset-service-account: "true" + preset-azure-cred: "true" + preset-azure-windows: "true" + preset-k8s-ssh: "true" + preset-dind-enabled: "true" + extra_refs: + - org: kubernetes-sigs + repo: azurefile-csi-driver + base_ref: master + path_alias: sigs.k8s.io/azurefile-csi-driver + spec: + containers: + - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master + command: + - runner.sh + - kubetest + args: + # Generic e2e test args + - --test + - --up + - --down + - --build=quick + - --dump=$(ARTIFACTS) + # Azure-specific test args + - --deployment=aksengine + - --provider=skeleton + - --aksengine-admin-username=azureuser + - --aksengine-admin-password=AdminPassw0rd + - --aksengine-creds=$(AZURE_CREDENTIALS) + - --aksengine-download-url=https://aka.ms/aks-engine/aks-engine-k8s-e2e.tar.gz + - --aksengine-public-key=$(K8S_SSH_PUBLIC_KEY_PATH) + - --aksengine-private-key=$(K8S_SSH_PRIVATE_KEY_PATH) + - --aksengine-winZipBuildScript=$(WIN_BUILD) + - --aksengine-orchestratorRelease=1.23 + - --aksengine-template-url=https://raw.githubusercontent.com/kubernetes-sigs/windows-testing/master/job-templates/kubernetes_in_tree_volume_plugins.json + - --aksengine-win-binaries + - --aksengine-deploy-custom-k8s + - --aksengine-agentpoolcount=2 + # Specific test args + - --test-azure-file-csi-driver + securityContext: + privileged: true + env: + - name: AZURE_STORAGE_DRIVER + value: kubernetes.io/azure-file # In-tree Azure file storage class + - name: TEST_WINDOWS + value: "true" diff --git a/config/jobs/kubernetes-sigs/sig-windows/release-1.23-windows.yaml b/config/jobs/kubernetes-sigs/sig-windows/release-1.23-windows.yaml new file mode 100644 index 000000000000..8c826eb58b80 --- /dev/null +++ b/config/jobs/kubernetes-sigs/sig-windows/release-1.23-windows.yaml @@ -0,0 +1,110 @@ +periodics: +- annotations: + testgrid-alert-email: kubernetes-provider-azure@googlegroups.com + testgrid-dashboards: sig-release-1.23-informing, sig-windows-signal, sig-windows-master-release + testgrid-tab-name: aks-engine-windows-containerd-1.23 + decorate: true + decoration_config: + timeout: 3h0m0s + extra_refs: + - base_ref: release-1.23 + org: kubernetes + path_alias: k8s.io/kubernetes + repo: kubernetes + interval: 3h + labels: + preset-azure-cred: "true" + preset-azure-windows: "true" + preset-dind-enabled: "true" + preset-k8s-ssh: "true" + preset-service-account: "true" + preset-windows-private-registry-cred: "true" + preset-windows-repo-list-master: "true" + name: ci-kubernetes-e2e-aks-engine-azure-master-windows-containerd-1-23 + spec: + containers: + - args: + - --test + - --up + - --down + - --build=quick + - --dump=$(ARTIFACTS) + - --deployment=aksengine + - --provider=skeleton + - --aksengine-admin-username=azureuser + - --aksengine-admin-password=AdminPassw0rd + - --aksengine-creds=$(AZURE_CREDENTIALS) + - --aksengine-download-url=https://aka.ms/aks-engine/aks-engine-k8s-e2e.tar.gz + - --aksengine-public-key=$(K8S_SSH_PUBLIC_KEY_PATH) + - --aksengine-private-key=$(K8S_SSH_PRIVATE_KEY_PATH) + - --aksengine-winZipBuildScript=$(WIN_BUILD) + - --aksengine-orchestratorRelease=1.23 + - --aksengine-template-url=https://raw.githubusercontent.com/kubernetes-sigs/windows-testing/master/job-templates/kubernetes_containerd_1_23.json + - --aksengine-win-binaries + - --aksengine-deploy-custom-k8s + - --test_args=--node-os-distro=windows -docker-config-file=$(DOCKER_CONFIG_FILE) + --ginkgo.focus=\[Conformance\]|\[NodeConformance\]|\[sig-windows\]|\[sig-apps\].CronJob|\[sig-api-machinery\].ResourceQuota|\[sig-network\].EndpointSlice + --ginkgo.skip=\[LinuxOnly\]|\[Serial\]|\[Slow\]|\[alpha\]|GMSA|Guestbook.application.should.create.and.stop.a.working.application|device.plugin.for.Windows + - --ginkgo-parallel=4 + command: + - runner.sh + - kubetest + image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-1.23 + name: "" + resources: {} + securityContext: + privileged: true +- interval: 24h + name: ci-kubernetes-e2e-aks-engine-azure-1-23-windows-containerd-serial-slow + decorate: true + decoration_config: + timeout: 5h + labels: + preset-service-account: "true" + preset-azure-cred: "true" + preset-azure-windows: "true" + preset-windows-repo-list-master: "true" + preset-k8s-ssh: "true" + preset-dind-enabled: "true" + extra_refs: + - org: kubernetes + repo: kubernetes + base_ref: release-1.22 + path_alias: k8s.io/kubernetes + spec: + containers: + - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-1.23 + command: + - runner.sh + - kubetest + args: + # Generic e2e test args + - --test + - --up + - --down + - --build=quick + - --dump=$(ARTIFACTS) + # Azure-specific test args + - --deployment=aksengine + - --provider=skeleton + - --aksengine-orchestratorRelease=1.23 + - --aksengine-admin-username=azureuser + - --aksengine-admin-password=AdminPassw0rd + - --aksengine-creds=$(AZURE_CREDENTIALS) + - --aksengine-download-url=https://aka.ms/aks-engine/aks-engine-k8s-e2e.tar.gz + - --aksengine-public-key=$(K8S_SSH_PUBLIC_KEY_PATH) + - --aksengine-private-key=$(K8S_SSH_PRIVATE_KEY_PATH) + - --aksengine-winZipBuildScript=$(WIN_BUILD) + - --aksengine-template-url=https://raw.githubusercontent.com/kubernetes-sigs/windows-testing/master/job-templates/kubernetes_containerd_1_23_serial.json + - --aksengine-win-binaries + - --aksengine-deploy-custom-k8s + # Specific test args + - --test_args=--node-os-distro=windows --ginkgo.focus=(\[sig-windows\]|\[sig-scheduling\].SchedulerPreemption|\[sig-autoscaling\].\[Feature:HPA\]|\[sig-apps\].CronJob).*(\[Serial\]|\[Slow\])|(\[Serial\]|\[Slow\]).*(\[Conformance\]|\[NodeConformance\]) --ginkgo.skip=\[LinuxOnly\]|device.plugin.for.Windows|\[sig-scheduling\].SchedulerPredicates.\[Serial\].validates.that.there.is.no.conflict.between.pods.with.same.hostPort + - --ginkgo-parallel=1 + securityContext: + privileged: true + annotations: + testgrid-dashboards: sig-windows-1.23-release + testgrid-tab-name: aks-engine-windows-containerd-serial-slow-1.23 + testgrid-alert-email: kubernetes-provider-azure@googlegroups.com + description: Runs SIG-Windows release serial tests on K8s 1.23 clusters provided by aks-engine (https://github.com/Azure/aks-engine) on Azure cloud diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.23.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.23.yaml index 68c0a0e31121..8aab3aee9cd4 100644 --- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.23.yaml +++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.23.yaml @@ -873,61 +873,6 @@ periodics: memory: 9Gi securityContext: privileged: true -- annotations: - testgrid-alert-email: kubernetes-provider-azure@googlegroups.com - testgrid-dashboards: sig-release-1.23-informing, sig-windows-signal, sig-windows-master-release - testgrid-tab-name: aks-engine-windows-containerd-1.23 - decorate: true - decoration_config: - timeout: 3h0m0s - extra_refs: - - base_ref: release-1.23 - org: kubernetes - path_alias: k8s.io/kubernetes - repo: kubernetes - interval: 3h - labels: - preset-azure-cred: "true" - preset-azure-windows: "true" - preset-dind-enabled: "true" - preset-k8s-ssh: "true" - preset-service-account: "true" - preset-windows-private-registry-cred: "true" - preset-windows-repo-list-master: "true" - name: ci-kubernetes-e2e-aks-engine-azure-master-windows-containerd-1-23 - spec: - containers: - - args: - - --test - - --up - - --down - - --build=quick - - --dump=$(ARTIFACTS) - - --deployment=aksengine - - --provider=skeleton - - --aksengine-admin-username=azureuser - - --aksengine-admin-password=AdminPassw0rd - - --aksengine-creds=$(AZURE_CREDENTIALS) - - --aksengine-download-url=https://aka.ms/aks-engine/aks-engine-k8s-e2e.tar.gz - - --aksengine-public-key=$(K8S_SSH_PUBLIC_KEY_PATH) - - --aksengine-private-key=$(K8S_SSH_PRIVATE_KEY_PATH) - - --aksengine-winZipBuildScript=$(WIN_BUILD) - - --aksengine-orchestratorRelease=1.22 - - --aksengine-template-url=https://raw.githubusercontent.com/kubernetes-sigs/windows-testing/master/job-templates/kubernetes_containerd_master.json - - --aksengine-win-binaries - - --aksengine-deploy-custom-k8s - - --test_args=--node-os-distro=windows -docker-config-file=$(DOCKER_CONFIG_FILE) - --ginkgo.focus=\[Conformance\]|\[NodeConformance\]|\[sig-windows\]|\[sig-apps\].CronJob|\[sig-api-machinery\].ResourceQuota|\[sig-network\].EndpointSlice - --ginkgo.skip=\[LinuxOnly\]|\[Serial\]|\[Slow\]|\[alpha\]|GMSA|Guestbook.application.should.create.and.stop.a.working.application|device.plugin.for.Windows - - --ginkgo-parallel=4 - command: - - runner.sh - - kubetest - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-1.23 - name: "" - resources: {} - securityContext: - privileged: true postsubmits: {} presubmits: kubernetes/kubernetes: diff --git a/config/testgrids/kubernetes/sig-windows/config.yaml b/config/testgrids/kubernetes/sig-windows/config.yaml index 9ca43ea4210b..7e85e75f6980 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.20-release - sig-windows-1.21-release - sig-windows-1.22-release + - sig-windows-1.23-release - sig-windows-master-release - sig-windows-presubmit - sig-windows-gce @@ -18,6 +19,7 @@ dashboards: - name: sig-windows-1.20-release - name: sig-windows-1.21-release - name: sig-windows-1.22-release +- name: sig-windows-1.23-release - name: sig-windows-master-release - name: sig-windows-presubmit - name: sig-windows-gce