From d88c6c17b578c4bc11368942689df0d6a64d02c4 Mon Sep 17 00:00:00 2001 From: Levi Blackstone Date: Fri, 21 Jul 2023 14:36:38 -0600 Subject: [PATCH] [internal] Fix parallel test flake (#2515) Two of the examples tests install different versions of the same CRD. This works in CSA mode because they overwrite each other, but cause a conflict in SSA mode. Since CRDs are cluster-scoped, it's nontrivial to fix since the tests run in parallel. Explicitly use CSA mode until we refactor the tests to run on separate clusters. --- tests/sdk/nodejs/examples/examples_test.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/sdk/nodejs/examples/examples_test.go b/tests/sdk/nodejs/examples/examples_test.go index c0e43bcdea..5cf62a1a96 100644 --- a/tests/sdk/nodejs/examples/examples_test.go +++ b/tests/sdk/nodejs/examples/examples_test.go @@ -295,6 +295,15 @@ func TestAccPrometheusOperator(t *testing.T) { With(integration.ProgramTestOptions{ Dir: filepath.Join(getCwd(t), "prometheus-operator"), SkipRefresh: true, + // TODO: set to SSA false to fix https://github.com/pulumi/pulumi-kubernetes/issues/2482. + // https://github.com/pulumi/pulumi-kubernetes/issues/2243 tracks work to split tests across different + // clusters, which would fix this problem + OrderedConfig: []integration.ConfigValue{ + { + Key: "kubernetes:enableServerSideApply", + Value: "false", + }, + }, ExtraRuntimeValidation: func( t *testing.T, stackInfo integration.RuntimeValidationStackInfo, ) { @@ -499,6 +508,15 @@ func TestRancher(t *testing.T) { SkipRefresh: true, Verbose: true, NoParallel: true, + // TODO: set to SSA false to fix https://github.com/pulumi/pulumi-kubernetes/issues/2482. + // https://github.com/pulumi/pulumi-kubernetes/issues/2243 tracks work to split tests across different + // clusters, which would fix this problem + OrderedConfig: []integration.ConfigValue{ + { + Key: "kubernetes:enableServerSideApply", + Value: "false", + }, + }, EditDirs: []integration.EditDir{ { Dir: filepath.Join(getCwd(t), "rancher", "step2"),