From 589bbee8a5b4e7182f2f54f787a9dce0b2a6e09a Mon Sep 17 00:00:00 2001 From: Bryce Lampe Date: Wed, 11 Dec 2024 13:17:57 -0800 Subject: [PATCH] Remove integrationTestProvider option --- provider-ci/internal/pkg/config.go | 4 ---- .../templates/bridged-provider/.github/workflows/main.yml | 5 ----- .../bridged-provider/.github/workflows/nightly-test.yml | 6 ------ .../bridged-provider/.github/workflows/prerelease.yml | 5 ----- .../bridged-provider/.github/workflows/release.yml | 5 ----- .../.github/workflows/run-acceptance-tests.yml | 6 ------ provider-ci/internal/pkg/templates/defaults.config.yaml | 3 --- 7 files changed, 34 deletions(-) diff --git a/provider-ci/internal/pkg/config.go b/provider-ci/internal/pkg/config.go index fae84025a5..144fc46b40 100644 --- a/provider-ci/internal/pkg/config.go +++ b/provider-ci/internal/pkg/config.go @@ -129,10 +129,6 @@ type Config struct { // https://github.com/search?q=org%3Apulumi+path%3A.ci-mgmt.yaml+%22extraTests%3A%22&type=code ExtraTests map[string]any `yaml:"extraTests"` // Only used by AWS... - // IntegrationTestProvider will run e2e tests in the provider as well as in - // the examples directory when set to true. Defaults to false. - IntegrationTestProvider bool `yaml:"integrationTestProvider"` - // TestPulumiExamples runs e2e tests using the examples and test suite in // the pulumi/examples repo when set to true. Defaults to false. This is // unused but potentially useful for azure-native onboarding: diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml index c872ba9209..4895695bd8 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml @@ -216,11 +216,6 @@ jobs: #{{- if .Config.Actions.PreTest }}# #{{ .Config.Actions.PreTest | toYaml | indent 4 }}# #{{- end }}# -#{{- if .Config.IntegrationTestProvider }}# - - name: Run provider tests - working-directory: provider - run: go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 - #{{- end }}# - name: Run tests run: cd examples && go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 strategy: diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml index 7a6e72ea6c..af1c3851c7 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml @@ -124,12 +124,6 @@ jobs: #{{- if .Config.Actions.PreTest }}# #{{ .Config.Actions.PreTest | toYaml | indent 4 }}# #{{- end }}# - #{{- if .Config.IntegrationTestProvider }}# - - name: Run provider tests - if: matrix.testTarget == 'local' - working-directory: provider - run: go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . - #{{- end }}# - name: Run tests run: cd examples && go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 strategy: diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml index d439178d1a..e7a8d2f040 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml @@ -154,11 +154,6 @@ jobs: #{{- if .Config.Actions.PreTest }}# #{{ .Config.Actions.PreTest | toYaml | indent 4 }}# #{{- end }}# - #{{- if .Config.IntegrationTestProvider }}# - - name: Run provider tests - working-directory: provider - run: go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . - #{{- end }}# - name: Run tests run: cd examples && go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . strategy: diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml index 858e86a222..8528fb5f7d 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml @@ -163,11 +163,6 @@ jobs: #{{- if .Config.Actions.PreTest }}# #{{ .Config.Actions.PreTest | toYaml | indent 4 }}# #{{- end }}# - #{{- if .Config.IntegrationTestProvider }}# - - name: Run provider tests - working-directory: provider - run: go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . - #{{- end }}# - name: Run tests run: cd examples && go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . strategy: diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/run-acceptance-tests.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/run-acceptance-tests.yml index 43abdace50..933564798f 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/run-acceptance-tests.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/run-acceptance-tests.yml @@ -211,12 +211,6 @@ jobs: #{{- if .Config.Actions.PreTest }}# #{{ .Config.Actions.PreTest | toYaml | indent 4 }}# #{{- end }}# - #{{- if .Config.IntegrationTestProvider }}# - - name: Run provider tests - if: matrix.testTarget == 'local' - working-directory: provider - run: go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . - #{{- end }}# - name: Run tests if: matrix.testTarget == 'local' run: cd examples && go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -skip TestPulumiExamples -parallel 4 . diff --git a/provider-ci/internal/pkg/templates/defaults.config.yaml b/provider-ci/internal/pkg/templates/defaults.config.yaml index 9fb1bb0086..d61e9b42bd 100644 --- a/provider-ci/internal/pkg/templates/defaults.config.yaml +++ b/provider-ci/internal/pkg/templates/defaults.config.yaml @@ -142,9 +142,6 @@ extraTests: # name: My Test # ... -# Run e2e tests in the provider as well as in the examples directory -integrationTestProvider: false - # Run e2e tests using the examples and test suite in the pulumi/examples repo. # This is unused: https://github.com/search?q=org%3Apulumi+path%3A.ci-mgmt.yaml+%22testPulumiExamples%3A%22&type=code testPulumiExamples: false