diff --git a/build.proj b/build.proj index 0032dc6c7..7871d1242 100644 --- a/build.proj +++ b/build.proj @@ -20,13 +20,6 @@ WorkingDirectory="$(NodeJSSdkDirectory)" /> - - - - - - - @@ -76,11 +69,6 @@ - - - - - + DependsOnTargets="EnsureGoDependencies;EnsureNodeDependencies;BuildNodeSdk;BuildGoCmds"> diff --git a/examples/examples_test.go b/examples/examples_test.go index 1278db6b5..9f60082cb 100644 --- a/examples/examples_test.go +++ b/examples/examples_test.go @@ -92,10 +92,7 @@ func TestExamples(t *testing.T) { } for _, example := range examples { - ex := example.With(integration.ProgramTestOptions{ - ReportStats: integration.NewS3Reporter("us-west-2", "eng.pulumi.com", "testreports"), - Tracing: "https://tracing.pulumi-engineering.com/collector/api/v1/spans", - }) + ex := example t.Run(example.Dir, func(t *testing.T) { integration.ProgramTest(t, &ex) }) diff --git a/pkg/testing/integration/program.go b/pkg/testing/integration/program.go index 1824b2664..a55b80ff4 100644 --- a/pkg/testing/integration/program.go +++ b/pkg/testing/integration/program.go @@ -328,6 +328,23 @@ func ProgramTest(t *testing.T, opts *ProgramTestOptions) { } }() + // Set up some default values for sending test reports and tracing data. We use environment varaiables to + // control these globally and set reasonable values for our own use in CI. + if opts.ReportStats == nil { + if v := os.Getenv("PULUMI_TEST_REPORT_CONFIG"); v != "" { + splits := strings.Split(v, ":") + if len(splits) != 3 { + t.Errorf("report config should be set to a value of the form: ::") + } + + opts.ReportStats = NewS3Reporter(splits[0], splits[1], splits[2]) + } + } + + if opts.Tracing == "" { + opts.Tracing = os.Getenv("PULUMI_TEST_TRACE_ENDPOINT") + } + pt := newProgramTester(t, opts) err := pt.testLifeCycleInitAndDestroy() assert.NoError(t, err) diff --git a/scripts/make_release.ps1 b/scripts/make_release.ps1 index 7f38d198f..b66b170f4 100644 --- a/scripts/make_release.ps1 +++ b/scripts/make_release.ps1 @@ -34,12 +34,6 @@ CopyPackage "$Root\sdk\nodejs\bin" "pulumi" Copy-Item "$Root\sdk\nodejs\dist\pulumi-resource-pulumi-nodejs.cmd" "$PublishDir\bin" -New-Item -ItemType Directory -Path "$PublishDir\bin\v6.10.2" | Out-Null -New-Item -ItemType Directory -Path "$PublishDir\bin\custom_node" | Out-Null -Copy-Item "$Root\sdk\nodejs\prebuilt\nativeruntime.node" "$PublishDir\bin\v6.10.2" -Copy-Item "$Root\sdk\nodejs\prebuilt\nativeruntime-v0.11.0.node" "$PublishDir\bin\v6.10.2" -Copy-Item "$Root\sdk\nodejs\prebuilt\pulumi-language-nodejs-node.exe" "$PublishDir\bin\custom_node\node.exe" - # By default, if the archive already exists, 7zip will just add files to it, so blow away the existing # archive if it exists. if (Test-Path $PublishFile) { diff --git a/sdk/nodejs/Makefile b/sdk/nodejs/Makefile index 2dae3e981..c2fdf9ad3 100644 --- a/sdk/nodejs/Makefile +++ b/sdk/nodejs/Makefile @@ -15,11 +15,6 @@ include ../../build/common.mk export PATH:=$(shell yarn bin 2>/dev/null):$(PATH) -ensure:: - [ -d "./prebuilt/" ] || mkdir "./prebuilt" - [ -e "./prebuilt/nativeruntime.node" ] || aws s3 cp "s3://eng.pulumi.com/nativeruntime/$$(go env GOOS)/nativeruntime.node" "./prebuilt/" - [ -e "./prebuilt/nativeruntime-v0.11.0.node" ] || aws s3 cp "s3://eng.pulumi.com/nativeruntime/$$(go env GOOS)/nativeruntime-v0.11.0.node" "./prebuilt/" - lint:: $(GOMETALINTER) cmd/pulumi-language-nodejs/main.go | sort ; exit "$${PIPESTATUS[0]}" tslint -c tslint.json -p tsconfig.json @@ -39,7 +34,6 @@ install:: GOBIN=$(PULUMI_BIN) go install -ldflags "-X github.com/pulumi/pulumi/pkg/version.Version=${VERSION}" ${LANGUAGE_HOST} cp dist/pulumi-resource-pulumi-nodejs "$(PULUMI_BIN)" mkdir -p "$(PULUMI_BIN)/v6.10.2" - cp ./prebuilt/*.node "$(PULUMI_BIN)/v6.10.2/" rm -rf "$(PULUMI_NODE_MODULES)/$(NODE_MODULE_NAME)/tests" test_fast::