diff --git a/docs/book/src/developers/development.md b/docs/book/src/developers/development.md index 79efd00fe78..ede226333f3 100644 --- a/docs/book/src/developers/development.md +++ b/docs/book/src/developers/development.md @@ -540,7 +540,7 @@ With the following environment variables defined, you can build a CAPZ cluster f | `E2E_ARGS` | `-kubetest.use-ci-artifacts` | | `KUBERNETES_VERSION` | `latest` - extract Kubernetes version from https://dl.k8s.io/ci/latest.txt (main's HEAD)
`latest-1.` - extract Kubernetes version from dl.k8s.io/ci/latest-1..txt (release branch's HEAD) | | `WINDOWS_SERVER_VERSION` | Optional, can be `windows-2019` (default) or `windows-2022` | -| `KUBETEST_WINDOWS_CONFIG` | Optional, can be `upstream-windows-serial-slow.yaml`, when not specified `upstream-windows.yaml` is used | +| `KUBETEST_WINDOWS_CONFIG` | Default is `upstream-windows.yaml`. CAPZ contains various other configuration recipes in the `test/e2e/data/` directory; you may use any of those by referencing their file names as the value of `KUBETEST_WINDOWS_CONFIG` (e.g., `conformance-fast.yaml`), or you may drop in your own config files into `test/e2e/data/` and reference those. | | `WINDOWS_CONTAINERD_URL` | Optional, can be any url to a `tar.gz` file containing binaries for containerd in the same format as upstream package | With the following environment variables defined, CAPZ runs `./scripts/ci-build-kubernetes.sh` as part of `./scripts/ci-conformance.sh`, which allows developers to build Kubernetes from source and run the Kubernetes Conformance test suite against a CAPZ cluster based on the custom build: diff --git a/test/e2e/data/kubetest/upstream-windows-serial-slow-ginkgo-v2.yaml b/test/e2e/data/kubetest/upstream-windows-serial-slow-ginkgo-v2.yaml deleted file mode 100644 index 17a1578ffab..00000000000 --- a/test/e2e/data/kubetest/upstream-windows-serial-slow-ginkgo-v2.yaml +++ /dev/null @@ -1,12 +0,0 @@ -ginkgo.focus: (\[sig-windows\]|\[sig-scheduling\].SchedulerPreemption|\[sig-autoscaling\].\[Feature:HPA\]|\[sig-apps\].CronJob).*(\[Serial\]|\[Slow\])|(\[Serial\]|\[Slow\]).*(\[Conformance\]|\[NodeConformance\])|\[sig-api-machinery\].Garbage.collector -ginkgo.skip: \[LinuxOnly\]|\[Excluded:WindowsDocker\]|\[Feature:DynamicResourceAllocation\]|device.plugin.for.Windows -disable-log-dump: true -ginkgo.progress: true -ginkgo.slow-spec-threshold: 120s -ginkgo.flakeAttempts: 0 -ginkgo.trace: true -ginkgo.v: true -ginkgo.timeout: 4h -node-os-distro: windows -dump-logs-on-failure: true -prepull-images: true diff --git a/test/e2e/data/kubetest/upstream-windows-serial-slow.yaml b/test/e2e/data/kubetest/upstream-windows-serial-slow.yaml deleted file mode 100644 index 0790af8232b..00000000000 --- a/test/e2e/data/kubetest/upstream-windows-serial-slow.yaml +++ /dev/null @@ -1,11 +0,0 @@ -ginkgo.focus: (\[sig-windows\]|\[sig-scheduling\].SchedulerPreemption|\[sig-autoscaling\].\[Feature:HPA\]|\[sig-apps\].CronJob).*(\[Serial\]|\[Slow\])|(\[Serial\]|\[Slow\]).*(\[Conformance\]|\[NodeConformance\])|\[sig-api-machinery\].Garbage.collector -ginkgo.skip: \[LinuxOnly\]|\[Excluded:WindowsDocker\]|\[Feature:DynamicResourceAllocation\]|device.plugin.for.Windows -disable-log-dump: true -ginkgo.progress: true -ginkgo.slowSpecThreshold: 120.0 -ginkgo.flakeAttempts: 0 -ginkgo.trace: true -ginkgo.v: true -node-os-distro: windows -dump-logs-on-failure: true -prepull-images: true