Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve bors merge reliability: Windows smoke tests are advisory and run with reduced parallelism #11471

Merged
merged 3 commits into from Dec 8, 2022
Merged

Improve bors merge reliability: Windows smoke tests are advisory and run with reduced parallelism #11471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33c305e
ci: Make Windows smoke tests advisory only
AaronFriel Nov 25, 2022
55ed8c0
ci: use a larger runner size for Windows smoke tests
AaronFriel Dec 4, 2022
8457dfb
ci: Remove page file tweak for Windows
AaronFriel Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 7 additions & 8 deletions .github/workflows/ci-run-test.yml
View file
Open in desktop
Expand Up @@ -50,6 +50,11 @@ on:
"nodejs": "14.x",
"python": "3.9.x"
}
continue-on-error:
description: "Whether to continue running the job if the step fails"
required: false
default: false
type: boolean


defaults:
Expand Down Expand Up @@ -83,6 +88,8 @@ jobs:

runs-on: ${{ inputs.platform }}

timeout-minutes: 60
continue-on-error: ${{ inputs.continue-on-error }}
steps:
- name: "Windows cache workaround"
# https://github.com/actions/cache/issues/752#issuecomment-1222415717
Expand Down Expand Up @@ -125,14 +132,6 @@ jobs:
if: ${{ inputs.enable-coverage && runner.os != 'Windows' }}
run: |
echo "PULUMI_TEST_COVERAGE_PATH=$(pwd)/coverage" >> "$GITHUB_ENV"
# See: https://github.com/actions/virtual-environments/issues/2642#issuecomment-774988591
- name: Configure Windows pagefile
uses: aaronfriel/action-configure-pagefile@v2.0-beta.1
if: ${{ runner.os == 'Windows' }}
with:
minimum-size: 4GB
maximum-size: 4GB
disk-root: "D:"
- name: Configure Go Cache Key
env:
CACHE_KEY: "${{ fromJson(inputs.version-set).go }}-${{ runner.os }}-${{ runner.arch }}"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Expand Up @@ -293,6 +293,7 @@ jobs:
name: Smoke Test${{ matrix.platform && '' }}
needs: [matrix, build-binaries, build-sdks]
if: ${{ needs.matrix.outputs.smoke-test-matrix != '{}' }}
# alow jobs to fail if the platform contains windows
strategy:
fail-fast: ${{ contains(needs.matrix.outputs.smoke-test-matrix, 'macos') }}
matrix: ${{ fromJson(needs.matrix.outputs.smoke-test-matrix) }}
Expand All @@ -309,6 +310,7 @@ jobs:
# require-build: false # TODO, remove ${{ matrix.require-build || false }}

version-set: ${{ toJson(matrix.version-set) }}
continue-on-error: ${{ contains(matrix.platform, 'windows') }}
secrets: inherit

test-collect-reports:
Expand Down
3 changes: 3 additions & 0 deletions scripts/get-job-matrix.py
View file
Open in desktop
Expand Up @@ -391,6 +391,9 @@ def get_matrix(

test_suites += run_gotestsum_ci_matrix_single_package(item, pkg_tests, tags)

if kind == JobKind.SMOKE_TEST:
platforms = list(map(lambda p: "windows-8core-2022" if p == "windows-latest" else p, platforms))

return {
"test-suite": test_suites,
"platform": platforms,
Expand Down