Skip to content

Commit

Permalink
Use windows-2019 for smoke tests (#5388)
Browse files Browse the repository at this point in the history
  • Loading branch information
laurit authored Feb 17, 2022
1 parent 3a2b262 commit 7d255f2
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 30 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
strategy:
matrix:
os:
- windows-latest
- windows-2019
- ubuntu-latest
smoke-test-suite:
- jetty
Expand All @@ -124,13 +124,13 @@ jobs:
- wildfly
- other
exclude:
- os: windows-latest
- os: windows-2019
smoke-test-suite: websphere
fail-fast: false
steps:
- name: Support longpaths
run: git config --system core.longpaths true
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2019'

- uses: actions/[email protected]

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nightly-no-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
strategy:
matrix:
os:
- windows-latest
- windows-2019
- ubuntu-latest
smoke-test-suite:
- jetty
Expand All @@ -113,13 +113,13 @@ jobs:
- wildfly
- other
exclude:
- os: windows-latest
- os: windows-2019
smoke-test-suite: websphere
fail-fast: false
steps:
- name: Support longpaths
run: git config --system core.longpaths true
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2019'

- uses: actions/[email protected]

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
strategy:
matrix:
os:
- windows-latest
- windows-2019
- ubuntu-latest
smoke-test-suite:
- jetty
Expand All @@ -119,13 +119,13 @@ jobs:
- wildfly
- other
exclude:
- os: windows-latest
- os: windows-2019
smoke-test-suite: websphere
fail-fast: false
steps:
- name: Support longpaths
run: git config --system core.longpaths true
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2019'

- uses: actions/[email protected]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-smoke-test-fake-backend-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
cache-read-only: true

buildWindows:
runs-on: windows-latest
runs-on: windows-2019
defaults:
run:
shell: bash
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pr-smoke-test-servlet-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
os:
- windows-latest
- windows-2019
- ubuntu-latest
smoke-test-server:
- jetty
Expand All @@ -23,13 +23,13 @@ jobs:
- websphere
- wildfly
exclude:
- os: windows-latest
- os: windows-2019
smoke-test-server: websphere
fail-fast: false
steps:
- name: Support longpaths
run: git config --system core.longpaths true
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2019'

- uses: actions/[email protected]

Expand All @@ -40,15 +40,15 @@ jobs:
java-version: 11

- name: Build Linux docker images
if: matrix.os != 'windows-latest'
if: matrix.os != 'windows-2019'
uses: gradle/gradle-build-action@v2
with:
arguments: buildLinuxTestImages -PsmokeTestServer=${{ matrix.smoke-test-server }}
build-root-directory: smoke-tests/images/servlet
cache-read-only: true

- name: Build Windows docker images
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2019'
uses: gradle/gradle-build-action@v2
with:
arguments: buildWindowsTestImages -PsmokeTestServer=${{ matrix.smoke-test-server }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ jobs:
strategy:
matrix:
os:
- windows-latest
- windows-2019
- ubuntu-latest
smoke-test-suite:
- jetty
Expand All @@ -175,13 +175,13 @@ jobs:
- wildfly
- other
exclude:
- os: windows-latest
- os: windows-2019
smoke-test-suite: websphere
fail-fast: false
steps:
- name: Support longpaths
run: git config --system core.longpaths true
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2019'

- uses: actions/[email protected]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
build-root-directory: smoke-tests/images/fake-backend

publishWindows:
runs-on: windows-latest
runs-on: windows-2019
defaults:
run:
shell: bash
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/publish-smoke-test-servlet-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
matrix:
os:
- windows-latest
- windows-2019
- ubuntu-latest
smoke-test-server:
- jetty
Expand All @@ -29,13 +29,13 @@ jobs:
- websphere
- wildfly
exclude:
- os: windows-latest
- os: windows-2019
smoke-test-server: websphere
fail-fast: false
steps:
- name: Support longpaths
run: git config --system core.longpaths true
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2019'

- uses: actions/[email protected]

Expand All @@ -56,14 +56,14 @@ jobs:
run: echo "TAG=$(date '+%Y%m%d').$GITHUB_RUN_ID" >> $GITHUB_ENV

- name: Build Linux docker images
if: matrix.os != 'windows-latest'
if: matrix.os != 'windows-2019'
uses: gradle/gradle-build-action@v2
with:
arguments: buildLinuxTestImages pushMatrix -PextraTag=${{ env.TAG }} -PsmokeTestServer=${{ matrix.smoke-test-server }}
build-root-directory: smoke-tests/images/servlet

- name: Build Windows docker images
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2019'
uses: gradle/gradle-build-action@v2
with:
arguments: buildWindowsTestImages pushMatrix -PextraTag=${{ env.TAG }} -PsmokeTestServer=${{ matrix.smoke-test-server }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-gradle-plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
strategy:
matrix:
os:
- windows-latest
- windows-2019
- ubuntu-latest
smoke-test-suite:
- jetty
Expand All @@ -65,12 +65,12 @@ jobs:
- wildfly
- other
exclude:
- os: windows-latest
- os: windows-2019
smoke-test-suite: websphere
steps:
- name: Support longpaths
run: git config --system core.longpaths true
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2019'

- uses: actions/[email protected]
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
strategy:
matrix:
os:
- windows-latest
- windows-2019
- ubuntu-latest
smoke-test-suite:
- jetty
Expand All @@ -57,12 +57,12 @@ jobs:
- wildfly
- other
exclude:
- os: windows-latest
- os: windows-2019
smoke-test-suite: websphere
steps:
- name: Support longpaths
run: git config --system core.longpaths true
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2019'

- uses: actions/[email protected]
with:
Expand Down

0 comments on commit 7d255f2

Please sign in to comment.