From 387ad61b89293b43351d7e0458a58dce23950e97 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 19 Aug 2022 15:02:39 -0500 Subject: [PATCH 1/6] [build] disable classic tests on .NET 6 release branches Many of our Windows lanes on `release/6.0.4xx` are failing with: Xamarin.Provisioning.ProvisioningException: Failed to provision ---> Xamarin.Provisioning.ProvisioningException: Only extension versions greater than that in the instance catalog version (13.0.0.0) can be installed. This is because the CI machines have VS 17.3 now, and the classic Xamarin.Android we're building is too old. For now, let's just disable all these classic tests on this branch. We can come up with a better idea for this later. --- build-tools/automation/azure-pipelines.yaml | 13 ++++++++++++- .../yaml-templates/setup-test-environment.yaml | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 0b23fc239c6..e11afd375f2 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -341,6 +341,8 @@ stages: jobs: # Check - "Xamarin.Android (Smoke Tests APKs Legacy - macOS)" - job: mac_apk_tests_legacy + # Disabled on .NET 6 release branches + condition: false displayName: APKs Legacy - macOS pool: vmImage: $(HostedMacImage) @@ -820,7 +822,8 @@ stages: - stage: msbuild_legacy displayName: Legacy Tests dependsOn: mac_build - condition: and(succeeded(), or(eq(variables['RunAllTests'], true), contains(dependencies.mac_build.outputs['mac_build_create_installers.TestConditions.TestAreas'], 'MSBuild'))) + # Disabled on .NET 6 release branches + condition: false jobs: # Xamarin.Android (Test MSBuild Legacy - macOS) - template: yaml-templates\run-msbuild-mac-tests.yaml @@ -1000,6 +1003,8 @@ stages: # Check - "Xamarin.Android (MSBuild Emulator Tests macOS - Legacy)" - template: yaml-templates/run-msbuild-device-tests.yaml parameters: + # Disabled on .NET 6 release branches + condition: false node_id: 1 job_name: mac_msbuilddevice_tests_1 job_suffix: Legacy @@ -1008,6 +1013,8 @@ stages: - template: yaml-templates/run-msbuild-device-tests.yaml parameters: + # Disabled on .NET 6 release branches + condition: false node_id: 2 job_name: mac_msbuilddevice_tests_2 job_suffix: Legacy @@ -1016,6 +1023,8 @@ stages: - template: yaml-templates/run-msbuild-device-tests.yaml parameters: + # Disabled on .NET 6 release branches + condition: false node_id: 3 job_name: mac_msbuilddevice_tests_3 job_suffix: Legacy @@ -1024,6 +1033,8 @@ stages: - template: yaml-templates/run-msbuild-device-tests.yaml parameters: + # Disabled on .NET 6 release branches + condition: false node_id: 4 job_name: mac_msbuilddevice_tests_with_debugger job_suffix: Legacy diff --git a/build-tools/automation/yaml-templates/setup-test-environment.yaml b/build-tools/automation/yaml-templates/setup-test-environment.yaml index 9f1be0132e7..24f9db38921 100644 --- a/build-tools/automation/yaml-templates/setup-test-environment.yaml +++ b/build-tools/automation/yaml-templates/setup-test-environment.yaml @@ -21,6 +21,8 @@ steps: - template: run-installer.yaml parameters: + # Disabled on .NET 6 release branches + condition: false provisionExtraArgs: ${{ parameters.provisionExtraArgs }} provisionatorChannel: ${{ parameters.provisionatorChannel }} From 94e19de12343c7eb5e6ccb7a51413daef2f1d4c4 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 19 Aug 2022 16:53:26 -0500 Subject: [PATCH 2/6] Update run-installer.yaml --- .../automation/yaml-templates/run-installer.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/build-tools/automation/yaml-templates/run-installer.yaml b/build-tools/automation/yaml-templates/run-installer.yaml index 47f67a0e731..45278305c56 100644 --- a/build-tools/automation/yaml-templates/run-installer.yaml +++ b/build-tools/automation/yaml-templates/run-installer.yaml @@ -8,14 +8,16 @@ steps: artifactName: $(InstallerArtifactName) downloadPath: $(System.DefaultWorkingDirectory) patterns: xamarin.android*.pkg - condition: and(succeeded(), eq(variables['agent.os'], 'Darwin')) + # Disabled on .NET 6 release branches + condition: false - task: DownloadPipelineArtifact@2 inputs: artifactName: $(InstallerArtifactName) downloadPath: $(System.DefaultWorkingDirectory) patterns: Xamarin.Android*.vsix - condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT')) + # Disabled on .NET 6 release branches + condition: false - powershell: | $itemPattern = "*.vsix" @@ -29,7 +31,8 @@ steps: } Write-Host "##vso[task.setvariable variable=XA.Provisionator.Args]$installer" displayName: find installer and set provisionator variable - condition: and(succeeded(), ne(variables['agent.os'], 'Linux')) + # Disabled on .NET 6 release branches + condition: false - task: provisionator@2 inputs: @@ -37,6 +40,7 @@ steps: github_token: $(GitHub.Token) provisioning_script: $(XA.Provisionator.Args) provisioning_extra_args: ${{ parameters.provisionExtraArgs }} - condition: and(succeeded(), ne(variables['agent.os'], 'Linux')) + # Disabled on .NET 6 release branches + condition: false env: PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }} From 01e3aea608cf60b9a36969100c7f55d48f2c9c8e Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 19 Aug 2022 16:58:18 -0500 Subject: [PATCH 3/6] Working on conditions --- build-tools/automation/azure-pipelines.yaml | 8 -------- .../yaml-templates/run-msbuild-device-tests.yaml | 2 ++ .../automation/yaml-templates/setup-test-environment.yaml | 2 -- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index e11afd375f2..6e9938886e3 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -1003,8 +1003,6 @@ stages: # Check - "Xamarin.Android (MSBuild Emulator Tests macOS - Legacy)" - template: yaml-templates/run-msbuild-device-tests.yaml parameters: - # Disabled on .NET 6 release branches - condition: false node_id: 1 job_name: mac_msbuilddevice_tests_1 job_suffix: Legacy @@ -1013,8 +1011,6 @@ stages: - template: yaml-templates/run-msbuild-device-tests.yaml parameters: - # Disabled on .NET 6 release branches - condition: false node_id: 2 job_name: mac_msbuilddevice_tests_2 job_suffix: Legacy @@ -1023,8 +1019,6 @@ stages: - template: yaml-templates/run-msbuild-device-tests.yaml parameters: - # Disabled on .NET 6 release branches - condition: false node_id: 3 job_name: mac_msbuilddevice_tests_3 job_suffix: Legacy @@ -1033,8 +1027,6 @@ stages: - template: yaml-templates/run-msbuild-device-tests.yaml parameters: - # Disabled on .NET 6 release branches - condition: false node_id: 4 job_name: mac_msbuilddevice_tests_with_debugger job_suffix: Legacy diff --git a/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml index 5ad51b43315..d83b47cc956 100644 --- a/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml +++ b/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml @@ -11,6 +11,8 @@ parameters: jobs: - job: ${{ parameters.job_name }} displayName: MSBuild With Emulator - macOS-${{ parameters.node_id }} - ${{ parameters.job_suffix }} + # Disabled on .NET 6 release branches + condition: ne(${{ parameters.job_suffix }}, 'Legacy') pool: vmImage: $(HostedMacImage) timeoutInMinutes: 90 diff --git a/build-tools/automation/yaml-templates/setup-test-environment.yaml b/build-tools/automation/yaml-templates/setup-test-environment.yaml index 24f9db38921..9f1be0132e7 100644 --- a/build-tools/automation/yaml-templates/setup-test-environment.yaml +++ b/build-tools/automation/yaml-templates/setup-test-environment.yaml @@ -21,8 +21,6 @@ steps: - template: run-installer.yaml parameters: - # Disabled on .NET 6 release branches - condition: false provisionExtraArgs: ${{ parameters.provisionExtraArgs }} provisionatorChannel: ${{ parameters.provisionatorChannel }} From 705938d2bee2b87920460fa8fd149844b55fae4e Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 22 Aug 2022 09:50:33 -0500 Subject: [PATCH 4/6] Update run-msbuild-device-tests.yaml --- .../automation/yaml-templates/run-msbuild-device-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml index d83b47cc956..4b58af79ce3 100644 --- a/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml +++ b/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml @@ -12,7 +12,7 @@ jobs: - job: ${{ parameters.job_name }} displayName: MSBuild With Emulator - macOS-${{ parameters.node_id }} - ${{ parameters.job_suffix }} # Disabled on .NET 6 release branches - condition: ne(${{ parameters.job_suffix }}, 'Legacy') + condition: ne('${{ parameters.job_suffix }}', 'Legacy') pool: vmImage: $(HostedMacImage) timeoutInMinutes: 90 From 7c1efa9fc3b21d740877ae55d58bbe33337ecb32 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 24 Aug 2022 09:47:22 -0500 Subject: [PATCH 5/6] Continue to download provision classic .pkg --- .../automation/yaml-templates/run-installer.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/build-tools/automation/yaml-templates/run-installer.yaml b/build-tools/automation/yaml-templates/run-installer.yaml index 45278305c56..7bb53c666ff 100644 --- a/build-tools/automation/yaml-templates/run-installer.yaml +++ b/build-tools/automation/yaml-templates/run-installer.yaml @@ -8,8 +8,7 @@ steps: artifactName: $(InstallerArtifactName) downloadPath: $(System.DefaultWorkingDirectory) patterns: xamarin.android*.pkg - # Disabled on .NET 6 release branches - condition: false + condition: and(succeeded(), eq(variables['agent.os'], 'Darwin')) - task: DownloadPipelineArtifact@2 inputs: @@ -31,8 +30,8 @@ steps: } Write-Host "##vso[task.setvariable variable=XA.Provisionator.Args]$installer" displayName: find installer and set provisionator variable - # Disabled on .NET 6 release branches - condition: false + # Disabled Windows on .NET 6 release branches + condition: and(succeeded(), eq(variables['agent.os'], 'Darwin')) - task: provisionator@2 inputs: @@ -40,7 +39,7 @@ steps: github_token: $(GitHub.Token) provisioning_script: $(XA.Provisionator.Args) provisioning_extra_args: ${{ parameters.provisionExtraArgs }} - # Disabled on .NET 6 release branches - condition: false + # Disabled Windows on .NET 6 release branches + condition: and(succeeded(), eq(variables['agent.os'], 'Darwin')) env: PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }} From b8d1c81fcbdbd4c495a9fd688e49e28dabc19afc Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 24 Aug 2022 09:48:31 -0500 Subject: [PATCH 6/6] Disable classic BCL tests --- build-tools/automation/azure-pipelines.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 6e9938886e3..e86ecdec80f 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -1318,6 +1318,8 @@ stages: jobs: # Check - "Xamarin.Android (BCL Emulator Tests macOS)" - job: mac_bcl_tests + # Disabled on .NET 6 release branches + condition: false displayName: macOS pool: vmImage: $(HostedMacImage)