Skip to content

Commit 35d54ab

Browse files
blampeblampe
authored
Consolidate integration tests (#4910)
This moves integration tests currently under `provider` into the `examples` directory, and removes `provider_test` defined in `extraTests`. These integration tests will now benefit from pulumi/ci-mgmt#1033 as a result, and #4911 is no longer necessary.
1 parent e1ae150 commit 35d54ab

File tree

197 files changed

+1546
-2008
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+1546
-2008
lines changed

‎.ci-mgmt.yaml‎

Lines changed: 1 addition & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ actions:
5858
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
5959
aws-region: ${{ env.AWS_REGION }}
6060
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
61-
role-duration-seconds: 3600
61+
role-duration-seconds: 7200
6262
role-session-name: aws@githubActions
6363
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
6464
- name: Make upstream
@@ -126,73 +126,3 @@ extraTests:
126126
run: |
127127
cd upstream
128128
make provider-lint
129-
130-
provider_test:
131-
name: provider_test
132-
needs: build_sdk
133-
permissions:
134-
contents: read
135-
id-token: write
136-
runs-on: ubuntu-latest
137-
steps:
138-
- name: Free Disk Space (Ubuntu)
139-
uses: jlumbroso/free-disk-space@main
140-
with:
141-
swap-storage: false
142-
tool-cache: false
143-
- name: Checkout Repo
144-
uses: actions/checkout@v4
145-
with:
146-
ref: ${{ env.PR_COMMIT_SHA }}
147-
submodules: true
148-
- uses: pulumi/provider-version-action@v1
149-
with:
150-
set-env: 'PROVIDER_VERSION'
151-
- name: Setup tools
152-
uses: ./.github/actions/setup-tools
153-
with:
154-
tools: pulumictl, pulumi, go, node, dotnet, python, java
155-
- name: Prepare local workspace
156-
run: make prepare_local_workspace
157-
- name: Download bin
158-
uses: ./.github/actions/download-bin
159-
- name: Download SDK
160-
uses: ./.github/actions/download-sdk
161-
with:
162-
language: ${{ matrix.language }}
163-
- name: Restore makefile progress
164-
run: make --touch provider schema build_${{ matrix.language }}
165-
- name: Update path
166-
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
167-
- name: Install Python deps
168-
run: |-
169-
pip3 install virtualenv==20.0.23
170-
pip3 install pipenv
171-
- name: Install dependencies
172-
run: make install_${{ matrix.language}}_sdk
173-
- name: Install gotestfmt
174-
uses: GoTestTools/gotestfmt-action@v2
175-
with:
176-
token: ${{ secrets.GITHUB_TOKEN }}
177-
version: v2.5.0
178-
- name: Configure AWS Credentials
179-
uses: aws-actions/configure-aws-credentials@v4
180-
with:
181-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
182-
aws-region: ${{ env.AWS_REGION }}
183-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
184-
role-duration-seconds: 3600
185-
role-session-name: aws@githubActions
186-
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
187-
- name: Run provider tests
188-
run: |
189-
cd provider && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
190-
strategy:
191-
fail-fast: false
192-
matrix:
193-
language:
194-
- nodejs
195-
- python
196-
- dotnet
197-
- go
198-
- java

‎.github/workflows/aws-upstream-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
6767
aws-region: ${{ env.AWS_REGION }}
6868
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
69-
role-duration-seconds: 3600
69+
role-duration-seconds: 7200
7070
role-session-name: aws@githubActions
7171
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
7272
- name: Test ${{ matrix.service }}

‎.github/workflows/master.yml‎

Lines changed: 1 addition & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ jobs:
100100
- test
101101
- license_check
102102
- go_test_shim
103-
- provider_test
104103
- upstream_lint
105104
uses: ./.github/workflows/publish.yml
106105
secrets: inherit
@@ -187,7 +186,7 @@ jobs:
187186
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
188187
aws-region: ${{ env.AWS_REGION }}
189188
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
190-
role-duration-seconds: 3600
189+
role-duration-seconds: 7200
191190
role-session-name: aws@githubActions
192191
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
193192
- name: Make upstream
@@ -237,75 +236,6 @@ jobs:
237236
name: Upload coverage reports to Codecov
238237
uses: codecov/codecov-action@v4
239238
timeout-minutes: 60
240-
provider_test:
241-
name: provider_test
242-
needs: build_sdk
243-
permissions:
244-
contents: read
245-
id-token: write
246-
runs-on: ubuntu-latest
247-
steps:
248-
- name: Free Disk Space (Ubuntu)
249-
uses: jlumbroso/free-disk-space@main
250-
with:
251-
swap-storage: false
252-
tool-cache: false
253-
- name: Checkout Repo
254-
uses: actions/checkout@v4
255-
with:
256-
ref: ${{ env.PR_COMMIT_SHA }}
257-
submodules: true
258-
- uses: pulumi/provider-version-action@v1
259-
with:
260-
set-env: PROVIDER_VERSION
261-
- name: Setup tools
262-
uses: ./.github/actions/setup-tools
263-
with:
264-
tools: pulumictl, pulumi, go, node, dotnet, python, java
265-
- name: Prepare local workspace
266-
run: make prepare_local_workspace
267-
- name: Download bin
268-
uses: ./.github/actions/download-bin
269-
- name: Download SDK
270-
uses: ./.github/actions/download-sdk
271-
with:
272-
language: ${{ matrix.language }}
273-
- name: Restore makefile progress
274-
run: make --touch provider schema build_${{ matrix.language }}
275-
- name: Update path
276-
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
277-
- name: Install Python deps
278-
run: |-
279-
pip3 install virtualenv==20.0.23
280-
pip3 install pipenv
281-
- name: Install dependencies
282-
run: make install_${{ matrix.language}}_sdk
283-
- name: Install gotestfmt
284-
uses: GoTestTools/gotestfmt-action@v2
285-
with:
286-
token: ${{ secrets.GITHUB_TOKEN }}
287-
version: v2.5.0
288-
- name: Configure AWS Credentials
289-
uses: aws-actions/configure-aws-credentials@v4
290-
with:
291-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
292-
aws-region: ${{ env.AWS_REGION }}
293-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
294-
role-duration-seconds: 3600
295-
role-session-name: aws@githubActions
296-
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
297-
- name: Run provider tests
298-
run: |
299-
cd provider && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
300-
strategy:
301-
fail-fast: false
302-
matrix:
303-
language:
304-
- nodejs
305-
- python
306-
- dotnet
307-
- go
308-
- java
309239
upstream_lint:
310240
name: Run upstream provider-lint
311241
runs-on: ubuntu-latest

‎.github/workflows/nightly-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
104104
aws-region: ${{ env.AWS_REGION }}
105105
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
106-
role-duration-seconds: 3600
106+
role-duration-seconds: 7200
107107
role-session-name: aws@githubActions
108108
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
109109
- name: Make upstream

‎.github/workflows/prerelease.yml‎

Lines changed: 1 addition & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ jobs:
6060
- test
6161
- license_check
6262
- go_test_shim
63-
- provider_test
6463
- upstream_lint
6564
uses: ./.github/workflows/publish.yml
6665
secrets: inherit
@@ -127,7 +126,7 @@ jobs:
127126
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
128127
aws-region: ${{ env.AWS_REGION }}
129128
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
130-
role-duration-seconds: 3600
129+
role-duration-seconds: 7200
131130
role-session-name: aws@githubActions
132131
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
133132
- name: Make upstream
@@ -177,75 +176,6 @@ jobs:
177176
name: Upload coverage reports to Codecov
178177
uses: codecov/codecov-action@v4
179178
timeout-minutes: 60
180-
provider_test:
181-
name: provider_test
182-
needs: build_sdk
183-
permissions:
184-
contents: read
185-
id-token: write
186-
runs-on: ubuntu-latest
187-
steps:
188-
- name: Free Disk Space (Ubuntu)
189-
uses: jlumbroso/free-disk-space@main
190-
with:
191-
swap-storage: false
192-
tool-cache: false
193-
- name: Checkout Repo
194-
uses: actions/checkout@v4
195-
with:
196-
ref: ${{ env.PR_COMMIT_SHA }}
197-
submodules: true
198-
- uses: pulumi/provider-version-action@v1
199-
with:
200-
set-env: PROVIDER_VERSION
201-
- name: Setup tools
202-
uses: ./.github/actions/setup-tools
203-
with:
204-
tools: pulumictl, pulumi, go, node, dotnet, python, java
205-
- name: Prepare local workspace
206-
run: make prepare_local_workspace
207-
- name: Download bin
208-
uses: ./.github/actions/download-bin
209-
- name: Download SDK
210-
uses: ./.github/actions/download-sdk
211-
with:
212-
language: ${{ matrix.language }}
213-
- name: Restore makefile progress
214-
run: make --touch provider schema build_${{ matrix.language }}
215-
- name: Update path
216-
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
217-
- name: Install Python deps
218-
run: |-
219-
pip3 install virtualenv==20.0.23
220-
pip3 install pipenv
221-
- name: Install dependencies
222-
run: make install_${{ matrix.language}}_sdk
223-
- name: Install gotestfmt
224-
uses: GoTestTools/gotestfmt-action@v2
225-
with:
226-
token: ${{ secrets.GITHUB_TOKEN }}
227-
version: v2.5.0
228-
- name: Configure AWS Credentials
229-
uses: aws-actions/configure-aws-credentials@v4
230-
with:
231-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
232-
aws-region: ${{ env.AWS_REGION }}
233-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
234-
role-duration-seconds: 3600
235-
role-session-name: aws@githubActions
236-
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
237-
- name: Run provider tests
238-
run: |
239-
cd provider && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
240-
strategy:
241-
fail-fast: false
242-
matrix:
243-
language:
244-
- nodejs
245-
- python
246-
- dotnet
247-
- go
248-
- java
249179
upstream_lint:
250180
name: Run upstream provider-lint
251181
runs-on: ubuntu-latest

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ jobs:
6666
- test
6767
- license_check
6868
- go_test_shim
69-
- provider_test
7069
- upstream_lint
7170
uses: ./.github/workflows/publish.yml
7271
secrets: inherit
@@ -133,7 +132,7 @@ jobs:
133132
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
134133
aws-region: ${{ env.AWS_REGION }}
135134
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
136-
role-duration-seconds: 3600
135+
role-duration-seconds: 7200
137136
role-session-name: aws@githubActions
138137
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
139138
- name: Make upstream
@@ -183,75 +182,6 @@ jobs:
183182
name: Upload coverage reports to Codecov
184183
uses: codecov/codecov-action@v4
185184
timeout-minutes: 60
186-
provider_test:
187-
name: provider_test
188-
needs: build_sdk
189-
permissions:
190-
contents: read
191-
id-token: write
192-
runs-on: ubuntu-latest
193-
steps:
194-
- name: Free Disk Space (Ubuntu)
195-
uses: jlumbroso/free-disk-space@main
196-
with:
197-
swap-storage: false
198-
tool-cache: false
199-
- name: Checkout Repo
200-
uses: actions/checkout@v4
201-
with:
202-
ref: ${{ env.PR_COMMIT_SHA }}
203-
submodules: true
204-
- uses: pulumi/provider-version-action@v1
205-
with:
206-
set-env: PROVIDER_VERSION
207-
- name: Setup tools
208-
uses: ./.github/actions/setup-tools
209-
with:
210-
tools: pulumictl, pulumi, go, node, dotnet, python, java
211-
- name: Prepare local workspace
212-
run: make prepare_local_workspace
213-
- name: Download bin
214-
uses: ./.github/actions/download-bin
215-
- name: Download SDK
216-
uses: ./.github/actions/download-sdk
217-
with:
218-
language: ${{ matrix.language }}
219-
- name: Restore makefile progress
220-
run: make --touch provider schema build_${{ matrix.language }}
221-
- name: Update path
222-
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
223-
- name: Install Python deps
224-
run: |-
225-
pip3 install virtualenv==20.0.23
226-
pip3 install pipenv
227-
- name: Install dependencies
228-
run: make install_${{ matrix.language}}_sdk
229-
- name: Install gotestfmt
230-
uses: GoTestTools/gotestfmt-action@v2
231-
with:
232-
token: ${{ secrets.GITHUB_TOKEN }}
233-
version: v2.5.0
234-
- name: Configure AWS Credentials
235-
uses: aws-actions/configure-aws-credentials@v4
236-
with:
237-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
238-
aws-region: ${{ env.AWS_REGION }}
239-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
240-
role-duration-seconds: 3600
241-
role-session-name: aws@githubActions
242-
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
243-
- name: Run provider tests
244-
run: |
245-
cd provider && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
246-
strategy:
247-
fail-fast: false
248-
matrix:
249-
language:
250-
- nodejs
251-
- python
252-
- dotnet
253-
- go
254-
- java
255185
upstream_lint:
256186
name: Run upstream provider-lint
257187
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)