From 58d03081cc7c3e69b4f98af6f145759a9de865b8 Mon Sep 17 00:00:00 2001 From: Yi Huang Date: Wed, 15 Nov 2023 14:51:19 -0800 Subject: [PATCH] update 1es image (#3960) --- .azure/OneBranch.Tests.Official.yml | 8 +++--- .azure/OneBranch.Tests.PullRequest.yml | 8 +++--- .github/workflows/code-coverage.yml | 4 +-- .github/workflows/test.yml | 36 +++++++++++++------------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.azure/OneBranch.Tests.Official.yml b/.azure/OneBranch.Tests.Official.yml index f86c1967ac..f275256774 100644 --- a/.azure/OneBranch.Tests.Official.yml +++ b/.azure/OneBranch.Tests.Official.yml @@ -29,7 +29,7 @@ stages: - template: ./obtemplates/run-bvt.yml parameters: pool: 1es-msquic-pool-internal - image: WSPrerelease + image: WinServerPrerelease platform: windows tls: schannel logProfile: Full.Light @@ -45,7 +45,7 @@ stages: - template: ./obtemplates/run-bvt.yml parameters: pool: 1es-msquic-pool-internal - image: WSPrerelease + image: WinServerPrerelease platform: windows tls: schannel logProfile: Full.Light @@ -63,7 +63,7 @@ stages: - template: ./obtemplates/run-bvt.yml parameters: pool: 1es-msquic-pool-internal - image: WSPrerelease + image: WinServerPrerelease platform: windows tls: schannel logProfile: Full.Light @@ -81,7 +81,7 @@ stages: - template: ./obtemplates/run-bvt.yml parameters: pool: 1es-msquic-pool-internal - image: WSPrerelease + image: WinServerPrerelease platform: windows tls: schannel logProfile: Full.Light diff --git a/.azure/OneBranch.Tests.PullRequest.yml b/.azure/OneBranch.Tests.PullRequest.yml index 21b6acc2da..598396424d 100644 --- a/.azure/OneBranch.Tests.PullRequest.yml +++ b/.azure/OneBranch.Tests.PullRequest.yml @@ -29,7 +29,7 @@ stages: - template: ./obtemplates/run-bvt.yml parameters: pool: 1es-msquic-pool-internal - image: WSPrerelease + image: WinServerPrerelease platform: windows tls: schannel logProfile: Full.Light @@ -45,7 +45,7 @@ stages: - template: ./obtemplates/run-bvt.yml parameters: pool: 1es-msquic-pool-internal - image: WSPrerelease + image: WinServerPrerelease platform: windows tls: schannel logProfile: Full.Light @@ -63,7 +63,7 @@ stages: - template: ./obtemplates/run-bvt.yml parameters: pool: 1es-msquic-pool-internal - image: WSPrerelease + image: WinServerPrerelease platform: windows tls: schannel logProfile: Full.Light @@ -81,7 +81,7 @@ stages: - template: ./obtemplates/run-bvt.yml parameters: pool: 1es-msquic-pool-internal - image: WSPrerelease + image: WinServerPrerelease platform: windows tls: schannel logProfile: Full.Light diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index e2a186a8cb..3dd2deba6b 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -51,7 +51,7 @@ jobs: runs-on: - self-hosted - "1ES.Pool=1es-msquic-pool" - - "1ES.ImageOverride=WSPrerelease" + - "1ES.ImageOverride=WinServerPrerelease" steps: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 with: @@ -94,7 +94,7 @@ jobs: runs-on: - self-hosted - "1ES.Pool=1es-msquic-pool" - - "1ES.ImageOverride=WSPrerelease" + - "1ES.ImageOverride=WinServerPrerelease" env: main-timeout: 3600000 main-repeat: 100 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 161107119b..cf205b5b5b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -118,10 +118,10 @@ jobs: { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl3", test: "-Test" }, { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl3", xdp: "-UseXdp", test: "-Test" }, { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl3", xdp: "-UseXdp", useqtip: "-UseQtip", test: "-Test" }, - { config: "Debug", plat: "windows", os: "WSPrerelease", arch: "x64", tls: "schannel", test: "-Test" }, - { config: "Release", plat: "windows", os: "WSPrerelease", arch: "x64", tls: "schannel", test: "-Test" }, + { config: "Debug", plat: "windows", os: "WinServerPrerelease", arch: "x64", tls: "schannel", test: "-Test" }, + { config: "Release", plat: "windows", os: "WinServerPrerelease", arch: "x64", tls: "schannel", test: "-Test" }, ] - runs-on: ${{ matrix.vec.plat == 'windows' && matrix.vec.os == 'WSPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WSPrerelease'']') || matrix.vec.os }} + runs-on: ${{ matrix.vec.plat == 'windows' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease'']') || matrix.vec.os }} steps: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 with: @@ -129,8 +129,8 @@ jobs: - name: Download Build Artifacts uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a if: matrix.vec.plat == 'windows' - with: # note that BVT for WSPrerelease uses binaries built on windows-2022. - name: ${{ matrix.vec.config }}-${{ matrix.vec.plat }}-${{ matrix.vec.os == 'WSPrerelease' && 'windows-2022' || matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.xdp }}${{ matrix.vec.sanitize }}${{ matrix.vec.test }} + with: # note that BVT for WinServerPrerelease uses binaries built on windows-2022. + name: ${{ matrix.vec.config }}-${{ matrix.vec.plat }}-${{ matrix.vec.os == 'WinServerPrerelease' && 'windows-2022' || matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.xdp }}${{ matrix.vec.sanitize }}${{ matrix.vec.test }} path: artifacts - name: Download Build Artifacts uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a @@ -154,12 +154,12 @@ jobs: wevtutil.exe um $ManifestPath wevtutil.exe im $ManifestPath /rf:$($MsQuicDll) /mf:$($MsQuicDll) - name: Test - if: matrix.vec.os == 'WSPrerelease' + if: matrix.vec.os == 'WinServerPrerelease' shell: pwsh timeout-minutes: 120 run: scripts/test.ps1 -Config ${{ matrix.vec.config }} -Arch ${{ matrix.vec.arch }} -Tls ${{ matrix.vec.tls }} -GHA -LogProfile Full.Light -GenerateXmlResults ${{ matrix.vec.xdp }} ${{ matrix.vec.qtip }} - name: Test - if: matrix.vec.os != 'WSPrerelease' + if: matrix.vec.os != 'WinServerPrerelease' shell: pwsh timeout-minutes: 120 run: scripts/test.ps1 -Config ${{ matrix.vec.config }} -Arch ${{ matrix.vec.arch }} -Tls ${{ matrix.vec.tls }} -OsRunner ${{ matrix.vec.os }} -GHA -LogProfile Full.Light -GenerateXmlResults ${{ matrix.vec.xdp }} ${{ matrix.vec.qtip }} @@ -179,22 +179,22 @@ jobs: vec: [ { config: "Debug", plat: "winkernel", os: "windows-2022", arch: "x64", tls: "schannel", test: "-Test" }, { config: "Release", plat: "winkernel", os: "windows-2022", arch: "x64", tls: "schannel", test: "-Test" }, - { config: "Debug", plat: "winkernel", os: "WSPrerelease", arch: "x64", tls: "schannel", test: "-Test" }, - { config: "Release", plat: "winkernel", os: "WSPrerelease", arch: "x64", tls: "schannel", test: "-Test" }, + { config: "Debug", plat: "winkernel", os: "WinServerPrerelease", arch: "x64", tls: "schannel", test: "-Test" }, + { config: "Release", plat: "winkernel", os: "WinServerPrerelease", arch: "x64", tls: "schannel", test: "-Test" }, ] - runs-on: ${{ matrix.vec.plat == 'winkernel' && matrix.vec.os == 'WSPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WSPrerelease'']') || matrix.vec.os }} + runs-on: ${{ matrix.vec.plat == 'winkernel' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease'']') || matrix.vec.os }} steps: - name: Checkout repository uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - name: Download Build Artifacts uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a - with: # note that BVT for WSPrerelease uses binaries built on windows-2022. - name: ${{ matrix.vec.config }}-${{ matrix.vec.plat }}-${{ matrix.vec.os == 'WSPrerelease' && 'windows-2022' || matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.test }} + with: # note that BVT for WinServerPrerelease uses binaries built on windows-2022. + name: ${{ matrix.vec.config }}-${{ matrix.vec.plat }}-${{ matrix.vec.os == 'WinServerPrerelease' && 'windows-2022' || matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.test }} path: artifacts - name: Download Build Artifacts for Testing From WinUser uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a - with: # note that BVT for WSPrerelease uses binaries built on windows-2022. - name: ${{ matrix.vec.config }}-windows-${{ matrix.vec.os == 'WSPrerelease' && 'windows-2022' || matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.test }} + with: # note that BVT for WinServerPrerelease uses binaries built on windows-2022. + name: ${{ matrix.vec.config }}-windows-${{ matrix.vec.os == 'WinServerPrerelease' && 'windows-2022' || matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.test }} path: artifacts - name: Prepare Machine shell: pwsh @@ -238,9 +238,9 @@ jobs: { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl", xdp: "-UseXdp", test: "-Test" }, { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl3", test: "-Test" }, { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl3", xdp: "-UseXdp", test: "-Test" }, - { config: "Debug", plat: "windows", os: "WSPrerelease", arch: "x64", tls: "schannel", test: "-Test" }, + { config: "Debug", plat: "windows", os: "WinServerPrerelease", arch: "x64", tls: "schannel", test: "-Test" }, ] - runs-on: ${{ matrix.vec.plat == 'windows' && matrix.vec.os == 'WSPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WSPrerelease'']') || matrix.vec.os }} + runs-on: ${{ matrix.vec.plat == 'windows' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease'']') || matrix.vec.os }} env: main-timeout: 3600000 main-repeat: 100 @@ -256,7 +256,7 @@ jobs: - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a if: matrix.vec.plat == 'windows' with: - name: ${{ matrix.vec.config }}-${{ matrix.vec.plat }}-${{ matrix.vec.os == 'WSPrerelease' && 'windows-2022' || matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.xdp }}${{ matrix.vec.sanitize }}${{ matrix.vec.test }} + name: ${{ matrix.vec.config }}-${{ matrix.vec.plat }}-${{ matrix.vec.os == 'WinServerPrerelease' && 'windows-2022' || matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.xdp }}${{ matrix.vec.sanitize }}${{ matrix.vec.test }} path: artifacts - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a if: matrix.vec.plat == 'linux' || matrix.vec.plat == 'macos' @@ -299,7 +299,7 @@ jobs: runs-on: - self-hosted - "1ES.Pool=1es-msquic-pool" - - "1ES.ImageOverride=WSPrerelease" + - "1ES.ImageOverride=WinServerPrerelease" steps: - name: Checkout repository uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9