From 7d255f2e82ecdb90d4433ec8bdd5ea337dbe4e29 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Thu, 17 Feb 2022 09:14:14 +0200 Subject: [PATCH] Use windows-2019 for smoke tests (#5388) --- .github/workflows/ci.yml | 6 +++--- .github/workflows/nightly-no-cache.yml | 6 +++--- .github/workflows/nightly.yml | 6 +++--- .../workflows/pr-smoke-test-fake-backend-images.yml | 2 +- .github/workflows/pr-smoke-test-servlet-images.yml | 10 +++++----- .github/workflows/pr.yml | 6 +++--- .../publish-smoke-test-fake-backend-images.yml | 2 +- .../workflows/publish-smoke-test-servlet-images.yml | 10 +++++----- .github/workflows/release-gradle-plugins.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a14d740494..25c85d4d35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,7 @@ jobs: strategy: matrix: os: - - windows-latest + - windows-2019 - ubuntu-latest smoke-test-suite: - jetty @@ -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/checkout@v2.3.4 diff --git a/.github/workflows/nightly-no-cache.yml b/.github/workflows/nightly-no-cache.yml index 4fd5bec32c..10fce872ba 100644 --- a/.github/workflows/nightly-no-cache.yml +++ b/.github/workflows/nightly-no-cache.yml @@ -101,7 +101,7 @@ jobs: strategy: matrix: os: - - windows-latest + - windows-2019 - ubuntu-latest smoke-test-suite: - jetty @@ -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/checkout@v2.3.4 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 782343c6d3..7e4bd63bd8 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -107,7 +107,7 @@ jobs: strategy: matrix: os: - - windows-latest + - windows-2019 - ubuntu-latest smoke-test-suite: - jetty @@ -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/checkout@v2.3.4 diff --git a/.github/workflows/pr-smoke-test-fake-backend-images.yml b/.github/workflows/pr-smoke-test-fake-backend-images.yml index 0c71ccac5e..b347c0bf54 100644 --- a/.github/workflows/pr-smoke-test-fake-backend-images.yml +++ b/.github/workflows/pr-smoke-test-fake-backend-images.yml @@ -26,7 +26,7 @@ jobs: cache-read-only: true buildWindows: - runs-on: windows-latest + runs-on: windows-2019 defaults: run: shell: bash diff --git a/.github/workflows/pr-smoke-test-servlet-images.yml b/.github/workflows/pr-smoke-test-servlet-images.yml index eaf9e6f0de..21d9525033 100644 --- a/.github/workflows/pr-smoke-test-servlet-images.yml +++ b/.github/workflows/pr-smoke-test-servlet-images.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: - - windows-latest + - windows-2019 - ubuntu-latest smoke-test-server: - jetty @@ -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/checkout@v2.3.4 @@ -40,7 +40,7 @@ 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 }} @@ -48,7 +48,7 @@ jobs: 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 }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a257deaf5f..06c598a24d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -163,7 +163,7 @@ jobs: strategy: matrix: os: - - windows-latest + - windows-2019 - ubuntu-latest smoke-test-suite: - jetty @@ -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/checkout@v2.3.4 diff --git a/.github/workflows/publish-smoke-test-fake-backend-images.yml b/.github/workflows/publish-smoke-test-fake-backend-images.yml index be116dc267..ec840b0d60 100644 --- a/.github/workflows/publish-smoke-test-fake-backend-images.yml +++ b/.github/workflows/publish-smoke-test-fake-backend-images.yml @@ -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 diff --git a/.github/workflows/publish-smoke-test-servlet-images.yml b/.github/workflows/publish-smoke-test-servlet-images.yml index bfc764b0dd..fbecca3086 100644 --- a/.github/workflows/publish-smoke-test-servlet-images.yml +++ b/.github/workflows/publish-smoke-test-servlet-images.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: os: - - windows-latest + - windows-2019 - ubuntu-latest smoke-test-server: - jetty @@ -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/checkout@v2.3.4 @@ -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 }} diff --git a/.github/workflows/release-gradle-plugins.yml b/.github/workflows/release-gradle-plugins.yml index d6d60d76a3..1679f973f6 100644 --- a/.github/workflows/release-gradle-plugins.yml +++ b/.github/workflows/release-gradle-plugins.yml @@ -53,7 +53,7 @@ jobs: strategy: matrix: os: - - windows-latest + - windows-2019 - ubuntu-latest smoke-test-suite: - jetty @@ -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/checkout@v2.3.4 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0bfe4a081d..eb775ad4f1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,7 +45,7 @@ jobs: strategy: matrix: os: - - windows-latest + - windows-2019 - ubuntu-latest smoke-test-suite: - jetty @@ -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/checkout@v2.3.4 with: