Windows upstream e2e #1119
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| - op: add | ||
| path: /spec/files/- | ||
| value: | ||
| content: | | ||
| # /tmp is assumed created and required for upstream e2e tests to pass | ||
| New-Item -ItemType Directory -Force -Path C:\tmp\ | ||
| path: C:/create-temp-folder.ps1 | ||
| permissions: "0744" | ||
| - op: add | ||
| path: /spec/preKubeadmCommands/- | ||
| value: | ||
| powershell C:/create-temp-folder.ps1 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| - op: add | ||
| path: /spec/template/spec/files/- | ||
| value: | ||
| content: | | ||
| # /tmp is assumed created and required for upstream e2e tests to pass | ||
| New-Item -ItemType Directory -Force -Path C:\tmp\ | ||
| path: C:/create-temp-folder.ps1 | ||
| permissions: "0744" | ||
| - op: add | ||
| path: /spec/template/spec/preKubeadmCommands/- | ||
| value: | ||
| powershell C:/create-temp-folder.ps1 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,6 +24,11 @@ import ( | |
| "os" | ||
| "path/filepath" | ||
| "strconv" | ||
| "strings" | ||
|
|
||
| "sigs.k8s.io/cluster-api-provider-azure/test/e2e/kubernetes/node" | ||
|
|
||
jsturtevant marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| v1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
|
|
||
| . "github.com/onsi/ginkgo" | ||
| . "github.com/onsi/gomega" | ||
|
|
@@ -75,18 +80,28 @@ var _ = Describe("Conformance Tests", func() { | |
|
|
||
| kubernetesVersion := e2eConfig.GetVariable(capi_e2e.KubernetesVersion) | ||
| flavor := clusterctl.DefaultFlavor | ||
| if isWindows(kubetestConfigFilePath) { | ||
| flavor = "windows" | ||
| } | ||
|
|
||
| // clusters with CI artifacts or PR artifacts are based on a known CI version | ||
| // PR artifacts will replace the CI artifacts during kubeadm init | ||
| if useCIArtifacts || usePRArtifacts { | ||
| kubernetesVersion, err = resolveCIVersion(kubernetesVersion) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| Expect(os.Setenv("CI_VERSION", kubernetesVersion)).To(Succeed()) | ||
|
|
||
| if useCIArtifacts { | ||
| flavor = "conformance-ci-artifacts" | ||
| } else if usePRArtifacts { | ||
| flavor = "conformance-presubmit-artifacts" | ||
| } | ||
|
|
||
| if isWindows(kubetestConfigFilePath) { | ||
| flavor = flavor + "-windows" | ||
| } | ||
|
Comment on lines
+100
to
+102
There was a problem hiding this comment. I don't think this PR touches this logic. Is this a placeholder for a future PR? |
||
| } | ||
|
|
||
| workerMachineCount, err := strconv.ParseInt(e2eConfig.GetVariable("CONFORMANCE_WORKER_MACHINE_COUNT"), 10, 64) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| controlPlaneMachineCount, err := strconv.ParseInt(e2eConfig.GetVariable("CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT"), 10, 64) | ||
|
|
@@ -118,19 +133,37 @@ var _ = Describe("Conformance Tests", func() { | |
| b.RecordValue("cluster creation", runtime.Seconds()) | ||
| workloadProxy := bootstrapClusterProxy.GetWorkloadCluster(ctx, namespace.Name, clusterName) | ||
|
|
||
| // Windows requires a taint on control nodes nodes since not all conformance tests have ability to run | ||
| if isWindows(kubetestConfigFilePath) { | ||
| options := v1.ListOptions{ | ||
| LabelSelector: "kubernetes.io/os=linux", | ||
| } | ||
|
|
||
| noScheduleTaint := &corev1.Taint{ | ||
| Key: "node-role.kubernetes.io/master", | ||
| Value: "", | ||
| Effect: "NoSchedule", | ||
| } | ||
|
|
||
| err := node.TaintNode(workloadProxy.GetClientSet(), options, noScheduleTaint) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| } | ||
|
|
||
| ginkgoNodes, err := strconv.Atoi(e2eConfig.GetVariable("CONFORMANCE_NODES")) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| runtime = b.Time("conformance suite", func() { | ||
| err := kubetest.Run(context.Background(), | ||
|
There was a problem hiding this comment. Good catch. Might fix kubernetes/kubernetes#101434 (comment) |
||
| kubetest.RunInput{ | ||
| ClusterProxy: workloadProxy, | ||
| NumberOfNodes: int(workerMachineCount), | ||
| ConfigFilePath: kubetestConfigFilePath, | ||
| KubeTestRepoListPath: kubetestRepoListPath, | ||
| ConformanceImage: e2eConfig.GetVariable("CONFORMANCE_IMAGE"), | ||
| GinkgoNodes: ginkgoNodes, | ||
| }, | ||
| ) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| }) | ||
| b.RecordValue("conformance suite run time", runtime.Seconds()) | ||
| }, 1) | ||
|
|
@@ -144,3 +177,7 @@ var _ = Describe("Conformance Tests", func() { | |
| }) | ||
|
|
||
| }) | ||
|
|
||
| func isWindows(kubetestConfigFilePath string) bool { | ||
| return strings.Contains(kubetestConfigFilePath, "windows") | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| gcAuthenticatedRegistry: e2eprivate | ||
| gcEtcdRegistry: k8sprow.azurecr.io/kubernetes-e2e-test-images | ||
| privateRegistry: e2eteam | ||
|
There was a problem hiding this comment. This was directly pulled during I checked it in here for an example file and so it was standalone. |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| ginkgo.focus: \[Conformance\]|\[NodeConformance\]|\[sig-windows\]|\[sig-apps\].CronJob|\[sig-api-machinery\].ResourceQuota|\[sig-scheduling\].SchedulerPreemption | ||
| ginkgo.skip: \[LinuxOnly\]|\[Serial\]|Guestbook.application.should.create.and.stop.a.working.application|device.plugin.for.Windows|Container.Lifecycle.Hook.when.create.a.pod.with.lifecycle.hook.should.execute(.*)http.hook.properly | ||
| disable-log-dump: true | ||
| ginkgo.progress: true | ||
| ginkgo.slowSpecThreshold: 120.0 | ||
| ginkgo.flakeAttempts: 0 | ||
| ginkgo.trace: true | ||
| ginkgo.v: true | ||
| node-os-distro: windows |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: what do you think about
make test-conformance-windows?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I named it this way since there is no official "Conformance" for windows. We run a good set of conformance test but not all and additional Windows tests.
kubernetes/kubernetes#96639 for more info on where we are with Conformance for Windows