From 4cfcd116e3a6085be520fa87225a4d6872769be6 Mon Sep 17 00:00:00 2001 From: antonfirsov Date: Fri, 22 Mar 2024 15:03:53 +0100 Subject: [PATCH 1/2] workaround image bug in 1es-windows-2022-open --- eng/pipelines/libraries/stress/http.yml | 3 +++ eng/pipelines/libraries/stress/ssl.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml index f4f9c45de36e4..313b92c3e6b70 100644 --- a/eng/pipelines/libraries/stress/http.yml +++ b/eng/pipelines/libraries/stress/http.yml @@ -46,6 +46,9 @@ extends: fetchDepth: 5 - bash: | + # Workaround for /~https://github.com/microsoft/azure-pipelines-agent/issues/4554. Undo when the image bug is fixed. + Remove-Item -Path "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\Microsoft.VCToolsVersion.v143.default.txt" + $(dockerfilesFolder)/build-docker-sdk.sh -t $(sdkBaseImage) -c $(BUILD_CONFIGURATION) && \ echo "##vso[task.setvariable variable=succeeded;isOutput=true]true" name: buildRuntime diff --git a/eng/pipelines/libraries/stress/ssl.yml b/eng/pipelines/libraries/stress/ssl.yml index ab93994400d34..a70a18e828f04 100644 --- a/eng/pipelines/libraries/stress/ssl.yml +++ b/eng/pipelines/libraries/stress/ssl.yml @@ -76,6 +76,9 @@ extends: lfs: false - powershell: | + # Workaround for /~https://github.com/microsoft/azure-pipelines-agent/issues/4554. Undo when the image bug is fixed. + Remove-Item -Path "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\Microsoft.VCToolsVersion.v143.default.txt" + $(dockerfilesFolder)/build-docker-sdk.ps1 -w -t $(sdkBaseImage) -c $(BUILD_CONFIGURATION) displayName: Build CLR and Libraries From b8717d8d40d7b13f0235176a436e2990ad8f8e9e Mon Sep 17 00:00:00 2001 From: antonfirsov Date: Fri, 22 Mar 2024 19:37:07 +0100 Subject: [PATCH 2/2] oops --- eng/pipelines/libraries/stress/http.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml index 313b92c3e6b70..68bfcef6c5081 100644 --- a/eng/pipelines/libraries/stress/http.yml +++ b/eng/pipelines/libraries/stress/http.yml @@ -46,9 +46,6 @@ extends: fetchDepth: 5 - bash: | - # Workaround for /~https://github.com/microsoft/azure-pipelines-agent/issues/4554. Undo when the image bug is fixed. - Remove-Item -Path "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\Microsoft.VCToolsVersion.v143.default.txt" - $(dockerfilesFolder)/build-docker-sdk.sh -t $(sdkBaseImage) -c $(BUILD_CONFIGURATION) && \ echo "##vso[task.setvariable variable=succeeded;isOutput=true]true" name: buildRuntime @@ -122,6 +119,9 @@ extends: lfs: false - powershell: | + # Workaround for /~https://github.com/microsoft/azure-pipelines-agent/issues/4554. Undo when the image bug is fixed. + Remove-Item -Path "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\Microsoft.VCToolsVersion.v143.default.txt" + $(dockerfilesFolder)/build-docker-sdk.ps1 -w -t $(sdkBaseImage) -c $(BUILD_CONFIGURATION) echo "##vso[task.setvariable variable=succeeded;isOutput=true]true" name: buildRuntime