From 882c811cfb6946b9d5c80c73c6fab5d1009db49b Mon Sep 17 00:00:00 2001 From: Ian Wahbe Date: Fri, 10 Jan 2025 12:52:45 +0100 Subject: [PATCH] Remove `actions.preTest` in favor of `integrationTestProvider` By using ci-mgmt's intended solution for running integration tests in the `provider/` directory, we get a maintained test script and avoid overloading the `actions.preTest` hook to run tests. Related to https://github.com/pulumi/ci-mgmt/pull/1276, https://github.com/pulumi/ci-mgmt/pull/1274#issuecomment-2582085346 --- .ci-mgmt.yaml | 12 +----------- .github/workflows/test.yml | 5 +++-- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.ci-mgmt.yaml b/.ci-mgmt.yaml index 590fca5..c375644 100644 --- a/.ci-mgmt.yaml +++ b/.ci-mgmt.yaml @@ -1,24 +1,14 @@ provider: sdwan major-version: 0 makeTemplate: bridged -# TODO: Enable this once our random provider is updated with framework support -# generate-nightly-test-workflow: true plugins: - name: std version: "1.6.2" - - name: terraform version: "1.0.16" kind: converter - team: ecosystem providerDefaultBranch: main - -actions: - preTest: - - name: Run provider tests - run: | - cd provider && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt pulumiConvert: 1 registryDocs: true - +integrationTestProvider: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dec8ae6..ead1fd6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -78,8 +78,9 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} version: v2.5.0 - name: Run provider tests - run: | - cd provider && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt + if: matrix.testTarget == 'local' + working-directory: provider + run: go test -v -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . - name: Run tests if: matrix.testTarget == 'local' run: cd examples && go test -v -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -skip TestPulumiExamples -parallel 4 .