From b7e31928d4702e4e86cdf3620069c176ba7e8b35 Mon Sep 17 00:00:00 2001 From: Eric Wolz Date: Wed, 10 Jul 2024 16:22:40 -0700 Subject: [PATCH 01/14] Update vsts.yaml fore 1es build machines --- vsts/vsts.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vsts/vsts.yaml b/vsts/vsts.yaml index 8bc9c2622f..2c93b88db3 100644 --- a/vsts/vsts.yaml +++ b/vsts/vsts.yaml @@ -337,7 +337,7 @@ jobs: SHOULD_RUN: ${{ eq(variables['testNet472'], 'True') }} pool: # If this is changed, don't forget to update supported_platforms.md in the root directory. That document outlines what OS we test on and should stay up to date. - vmImage: windows-2022 + name: 'sdk-net--win-vs2022' steps: - task: PowerShell@2 displayName: 'Print vars' From e4f88e42590852f094fe9874bd804a1cd5dfb55d Mon Sep 17 00:00:00 2001 From: Eric Wolz Date: Wed, 10 Jul 2024 16:29:44 -0700 Subject: [PATCH 02/14] Disable file upload tests --- e2e/test/iothub/FileUploadE2ETests.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/e2e/test/iothub/FileUploadE2ETests.cs b/e2e/test/iothub/FileUploadE2ETests.cs index f56f806069..ad70529a70 100644 --- a/e2e/test/iothub/FileUploadE2ETests.cs +++ b/e2e/test/iothub/FileUploadE2ETests.cs @@ -98,6 +98,7 @@ public async Task FileUpload_X509_SmallFile_Http() [TestMethodWithRetry(Max = 3)] [Timeout(TestTimeoutMilliseconds)] [TestCategory("LongRunning")] + [Ignore()] public async Task FileUpload_SmallFile_Http_GranularSteps() { string filename = await GetTestFileNameAsync(FileSizeSmall).ConfigureAwait(false); @@ -110,6 +111,7 @@ public async Task FileUpload_SmallFile_Http_GranularSteps() [TestMethodWithRetry(Max = 3)] [Timeout(TestTimeoutMilliseconds)] [TestCategory("LongRunning")] + [Ignore()] public async Task FileUpload_SmallFile_Http_GranularSteps_x509() { string filename = await GetTestFileNameAsync(FileSizeSmall).ConfigureAwait(false); @@ -123,6 +125,7 @@ public async Task FileUpload_SmallFile_Http_GranularSteps_x509() [Timeout(TestTimeoutMilliseconds)] [TestCategory("LongRunning")] [TestCategory("Proxy")] + [Ignore()] public async Task FileUpload_SmallFile_Http_GranularSteps_Proxy() { string filename = await GetTestFileNameAsync(FileSizeSmall).ConfigureAwait(false); From c168573a2f1c8224986a639f4b10e7752c185be5 Mon Sep 17 00:00:00 2001 From: Eric Wolz Date: Thu, 11 Jul 2024 13:34:40 -0700 Subject: [PATCH 03/14] added choco install -y --- vsts/vsts.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vsts/vsts.yaml b/vsts/vsts.yaml index 2c93b88db3..624ebc7323 100644 --- a/vsts/vsts.yaml +++ b/vsts/vsts.yaml @@ -377,7 +377,7 @@ jobs: - task: CmdLine@2 displayName: 'Install .NET 4.7.2' inputs: - script: 'choco install netfx-4.7.2-devpack' + script: 'choco install -y netfx-4.7.2-devpack' - script: | choco install -y squid From 812bfd8bcac8bd7f2011dff3ee1f089da44eb7fc Mon Sep 17 00:00:00 2001 From: timtay-microsoft Date: Wed, 17 Jul 2024 11:51:24 -0700 Subject: [PATCH 04/14] Fix proxy setup in windows build --- vsts/vsts.yaml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/vsts/vsts.yaml b/vsts/vsts.yaml index 624ebc7323..2949484121 100644 --- a/vsts/vsts.yaml +++ b/vsts/vsts.yaml @@ -379,11 +379,17 @@ jobs: inputs: script: 'choco install -y netfx-4.7.2-devpack' - - script: | - choco install -y squid - - displayName: "Install Squid" + - task: Docker@1 + displayName: "Start Test Proxy" condition: eq(variables.SHOULD_RUN, 'True') + inputs: + containerregistrytype: "Container Registry" + command: "Run an image" + azureContainerRegistry: aziotacr.azurecr.io + imageName: aziotacr.azurecr.io/aziotbld/testproxy + containerName: "testproxy-instance" + ports: "127.0.0.1:8888:8888" + restartPolicy: unlessStopped - powershell: ./vsts/start_tpm_windows.ps1 displayName: "Start TPM Simulator" @@ -424,7 +430,7 @@ jobs: E2E_IKEY: $(E2E-IKEY) # Environment variables for the DevOps pipeline - PROXY_SERVER_ADDRESS: 127.0.0.1:3128 + PROXY_SERVER_ADDRESS: 127.0.0.1:8888 TARGET_BRANCH: $(System.PullRequest.TargetBranch) FRAMEWORK: $(FRAMEWORK) From 72f5c76b9dbbbd33e51427c20688d005b9e190e1 Mon Sep 17 00:00:00 2001 From: timtay-microsoft Date: Wed, 17 Jul 2024 11:52:57 -0700 Subject: [PATCH 05/14] Disable bulk import/export tests --- e2e/test/iothub/service/RegistryManagerExportDevicesTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e/test/iothub/service/RegistryManagerExportDevicesTests.cs b/e2e/test/iothub/service/RegistryManagerExportDevicesTests.cs index b379a3ee20..f676b5d5cb 100644 --- a/e2e/test/iothub/service/RegistryManagerExportDevicesTests.cs +++ b/e2e/test/iothub/service/RegistryManagerExportDevicesTests.cs @@ -31,6 +31,7 @@ public class RegistryManagerExportDevicesTests : E2EMsTestBase '\n', }; + [Ignore("Test infrastructure doesn't currently support this test")] [TestMethodWithRetry(Max = 3)] [Timeout(LongRunningTestTimeoutMilliseconds)] [TestCategory("LongRunning")] From 0c1d8481e6616da61b1fa259c9995307fc7c4c9a Mon Sep 17 00:00:00 2001 From: timtay-microsoft Date: Wed, 17 Jul 2024 12:01:11 -0700 Subject: [PATCH 06/14] start docker --- vsts/vsts.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/vsts/vsts.yaml b/vsts/vsts.yaml index 2949484121..8ad366a8c3 100644 --- a/vsts/vsts.yaml +++ b/vsts/vsts.yaml @@ -379,6 +379,13 @@ jobs: inputs: script: 'choco install -y netfx-4.7.2-devpack' + - task: Docker@2 + displayName: "Login to ACR" + condition: eq(variables.SHOULD_RUN, 'True') + inputs: + command: "login" + containerRegistry: "Azure IoT ACR" + - task: Docker@1 displayName: "Start Test Proxy" condition: eq(variables.SHOULD_RUN, 'True') From 007106b119714a7600e75d5de9579e91c01ca6e3 Mon Sep 17 00:00:00 2001 From: timtay-microsoft Date: Wed, 17 Jul 2024 14:43:41 -0700 Subject: [PATCH 07/14] try out another 1es image for docker access --- vsts/vsts.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vsts/vsts.yaml b/vsts/vsts.yaml index 8ad366a8c3..28fd76dc95 100644 --- a/vsts/vsts.yaml +++ b/vsts/vsts.yaml @@ -337,7 +337,7 @@ jobs: SHOULD_RUN: ${{ eq(variables['testNet472'], 'True') }} pool: # If this is changed, don't forget to update supported_platforms.md in the root directory. That document outlines what OS we test on and should stay up to date. - name: 'sdk-net--win-vs2022' + name: 'sdk-c--win-vs2022' steps: - task: PowerShell@2 displayName: 'Print vars' From d14552d1c44c62cdc99d22e76d97ee49909dff76 Mon Sep 17 00:00:00 2001 From: timtay-microsoft Date: Wed, 17 Jul 2024 15:11:12 -0700 Subject: [PATCH 08/14] Revert "try out another 1es image for docker access" This reverts commit 007106b119714a7600e75d5de9579e91c01ca6e3. --- vsts/vsts.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vsts/vsts.yaml b/vsts/vsts.yaml index 28fd76dc95..8ad366a8c3 100644 --- a/vsts/vsts.yaml +++ b/vsts/vsts.yaml @@ -337,7 +337,7 @@ jobs: SHOULD_RUN: ${{ eq(variables['testNet472'], 'True') }} pool: # If this is changed, don't forget to update supported_platforms.md in the root directory. That document outlines what OS we test on and should stay up to date. - name: 'sdk-c--win-vs2022' + name: 'sdk-net--win-vs2022' steps: - task: PowerShell@2 displayName: 'Print vars' From 0d2f440d0b23b83304f81770f337d8a300b23b60 Mon Sep 17 00:00:00 2001 From: Eric Wolz Date: Wed, 17 Jul 2024 17:13:33 -0700 Subject: [PATCH 09/14] Update vsts.yaml --- vsts/vsts.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/vsts/vsts.yaml b/vsts/vsts.yaml index 8ad366a8c3..83c7232180 100644 --- a/vsts/vsts.yaml +++ b/vsts/vsts.yaml @@ -345,6 +345,7 @@ jobs: inputs: targetType: inline script: | + & 'C:\Program Files\Docker\Docker\DockerCli.exe' -SwitchDaemon Write-Host "Build.Reason: ${{ variables['Build.Reason'] }}" Write-Host "jobTimeoutInMinutes: ${{ parameters.jobTimeoutInMinutes }}" Write-Host "maxParallelJobs: ${{ parameters.maxParallelJobs }}" From fdcf31ab2787ed856db5bbd86598f1c225c60a3b Mon Sep 17 00:00:00 2001 From: Eric Wolz Date: Wed, 17 Jul 2024 17:25:43 -0700 Subject: [PATCH 10/14] Update vsts.yaml --- vsts/vsts.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vsts/vsts.yaml b/vsts/vsts.yaml index 83c7232180..957b59acab 100644 --- a/vsts/vsts.yaml +++ b/vsts/vsts.yaml @@ -345,7 +345,8 @@ jobs: inputs: targetType: inline script: | - & 'C:\Program Files\Docker\Docker\DockerCli.exe' -SwitchDaemon + dir C:\ProgramData\chocolatey -Depth 5 + & 'DockerCli.exe' -SwitchDaemon Write-Host "Build.Reason: ${{ variables['Build.Reason'] }}" Write-Host "jobTimeoutInMinutes: ${{ parameters.jobTimeoutInMinutes }}" Write-Host "maxParallelJobs: ${{ parameters.maxParallelJobs }}" From fdd7256ab1e9460b22cfd94ac8f8d29ead62d954 Mon Sep 17 00:00:00 2001 From: Eric Wolz Date: Wed, 17 Jul 2024 17:27:21 -0700 Subject: [PATCH 11/14] Update vsts.yaml --- vsts/vsts.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vsts/vsts.yaml b/vsts/vsts.yaml index 957b59acab..8b16ce00ba 100644 --- a/vsts/vsts.yaml +++ b/vsts/vsts.yaml @@ -345,7 +345,7 @@ jobs: inputs: targetType: inline script: | - dir C:\ProgramData\chocolatey -Depth 5 + dir 'C:\ProgramData\chocolatey' -Depth 5 & 'DockerCli.exe' -SwitchDaemon Write-Host "Build.Reason: ${{ variables['Build.Reason'] }}" Write-Host "jobTimeoutInMinutes: ${{ parameters.jobTimeoutInMinutes }}" From 910b21e30d2cef1128b267275b3fb3d3f3f6fe06 Mon Sep 17 00:00:00 2001 From: Eric Wolz Date: Wed, 17 Jul 2024 17:38:10 -0700 Subject: [PATCH 12/14] Update vsts.yaml --- vsts/vsts.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/vsts/vsts.yaml b/vsts/vsts.yaml index 8b16ce00ba..3385bdefc3 100644 --- a/vsts/vsts.yaml +++ b/vsts/vsts.yaml @@ -345,6 +345,7 @@ jobs: inputs: targetType: inline script: | + choco install docker-cli dir 'C:\ProgramData\chocolatey' -Depth 5 & 'DockerCli.exe' -SwitchDaemon Write-Host "Build.Reason: ${{ variables['Build.Reason'] }}" From 3c5e01220fc3b39c353ceeba6c6275df5241bdcb Mon Sep 17 00:00:00 2001 From: Eric Wolz Date: Wed, 17 Jul 2024 17:44:54 -0700 Subject: [PATCH 13/14] Update vsts.yaml --- vsts/vsts.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vsts/vsts.yaml b/vsts/vsts.yaml index 3385bdefc3..024d5705ae 100644 --- a/vsts/vsts.yaml +++ b/vsts/vsts.yaml @@ -345,8 +345,7 @@ jobs: inputs: targetType: inline script: | - choco install docker-cli - dir 'C:\ProgramData\chocolatey' -Depth 5 + dir 'C:\' -Depth 20 & 'DockerCli.exe' -SwitchDaemon Write-Host "Build.Reason: ${{ variables['Build.Reason'] }}" Write-Host "jobTimeoutInMinutes: ${{ parameters.jobTimeoutInMinutes }}" From e0fbac763c561de282c77107b25029038540ca93 Mon Sep 17 00:00:00 2001 From: Eric Wolz Date: Wed, 17 Jul 2024 18:11:06 -0700 Subject: [PATCH 14/14] Update vsts.yaml --- vsts/vsts.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/vsts/vsts.yaml b/vsts/vsts.yaml index 024d5705ae..8ad366a8c3 100644 --- a/vsts/vsts.yaml +++ b/vsts/vsts.yaml @@ -345,8 +345,6 @@ jobs: inputs: targetType: inline script: | - dir 'C:\' -Depth 20 - & 'DockerCli.exe' -SwitchDaemon Write-Host "Build.Reason: ${{ variables['Build.Reason'] }}" Write-Host "jobTimeoutInMinutes: ${{ parameters.jobTimeoutInMinutes }}" Write-Host "maxParallelJobs: ${{ parameters.maxParallelJobs }}"