Cleanup pipelines and Selectively enable Selenium

Author: javiercn

.azure/pipelines/jobs/default-build.yml

@@ -122,10 +122,9 @@ jobs:
         versionSpec: 10.x
   - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}:
     - powershell: ./eng/scripts/InstallJdk.ps1 '11.0.1'
-    - powershell: Write-Host "##vso[task.prependpath]$env:JAVA_HOME\bin"
-    - script: |
-        echo %PATH%
       displayName: Install JDK 11
+    - powershell: Write-Host "##vso[task.prependpath]$env:JAVA_HOME\bin"
+      displayName: Prepend JAVA bin folder to the PATH.
   - ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows'), eq(parameters.codeSign, 'true')) }}:
     - task: MicroBuildSigningPlugin@1
       displayName: Install MicroBuild Signing plugin
@@ -142,7 +141,7 @@ jobs:
   - ${{ if eq(parameters.steps, '')}}:
     - ${{ if eq(parameters.buildScript, '') }}:
       - ${{ if eq(parameters.agentOs, 'Windows') }}:
-        - script: set PATH=$(JAVA_HOME)\bin;%PATH% & .\$(BuildDirectory)\build.cmd -ci /p:SignType=$(_SignType) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
+        - script: .\$(BuildDirectory)\build.cmd -ci /p:SignType=$(_SignType) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
           displayName: Run build.cmd
       - ${{ if ne(parameters.agentOs, 'Windows') }}:
         - script: ./$(BuildDirectory)/build.sh -ci -p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)

eng/scripts/InstallJdk.ps1

@@ -1,16 +1,16 @@
 
 param(
-  [Parameter(Mandatory = $true)]
-  $JdkVersion
-)
+    [Parameter(Mandatory = $true)]
+    $JdkVersion
+    )
 
 $ErrorActionPreference = 'Stop'
 $ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138
 
 Set-StrictMode -Version 1
 
 if (-not $env:JAVA_HOME) {
-  throw 'You must set the JAVA_HOME environment variable to the destination of the JDK.'
+    throw 'You must set the JAVA_HOME environment variable to the destination of the JDK.'
 }
 
 $repoRoot = Resolve-Path "$PSScriptRoot/../.."
@@ -25,8 +25,3 @@ mkdir (split-path -parent $env:JAVA_HOME) -ea ignore | out-null
 Write-Host "Installing JDK to $env:JAVA_HOME"
 Move-Item "$tempDir/jdk/jdk-${jdkVersion}" $env:JAVA_HOME
 Write-Host "Done installing JDK to $env:JAVA_HOME"
-
-if (-not $env:Path.Contains($env:JAVA_HOME)) {
-  Write-Host "##vso[task.prependpath]$env:JAVA_HOME\bin";
-  Write-Host "PATH = $env:Path"
-}

src/Shared/E2ETesting/E2ETesting.props

@@ -2,7 +2,8 @@
   <PropertyGroup>
     <_DefaultProjectFilter>$(MSBuildProjectDirectory)\..\..</_DefaultProjectFilter>
     <DefaultItemExcludes>$(DefaultItemExcludes);node_modules\**</DefaultItemExcludes>
-    <EnforcePrerequisites Condition="'$(EnforcePrerequisites)' == '' and '$(CI)' != 'true' and '$(OS)' == 'Windows_NT'">True</EnforcePrerequisites>
+    <SeleniumE2ETestsSupported Condition="'$(SeleniumE2ETestsSupported)' == '' and '$(TargetArchitecture)' != 'arm' and '$(OS)' == 'Windows_NT'">true</SeleniumE2ETestsSupported>
+    <EnforcePrerequisites Condition="'$(SeleniumE2ETestsSupported)' == 'true' and '$(EnforcePrerequisites)' == ''">true</EnforcePrerequisites>
 
     <!-- WebDriver is not strong-named, so this test project cannot be strong named either. -->
     <SignAssembly>false</SignAssembly>

src/Shared/E2ETesting/E2ETesting.targets

@@ -4,14 +4,26 @@
 
   <!-- Ensuring that everything is ready before build -->
 
-  <Target Name="EnsureNodeJSRestored" BeforeTargets="Build">
+  <Target Name="EnsureNodeJSRestored" Condition="'$(SeleniumE2ETestsSupported)' == 'true'" BeforeTargets="Build">
     <Message Text="Running yarn install on $(MSBuildProjectFile)" Importance="High" />
+
+    <Message Condition="'$(EnforcePrerequisites)' == ''"
+      Importance="High"
+      Text="Prerequisites were not enforced at build time. Running Yarn or the E2E tests might fail as a result. Check /src/Shared/E2ETesting/Readme.md for instructions." />
+
     <Yarn Command="install" />
   </Target>
 
+  <Target
+    Name="WarnSeleniumNotSupported"
+    BeforeTargets="Build"
+    Condition="'$(SeleniumE2ETestsSupported)' == ''">
+    <Message Importance="High" Text="Selenium tests are not supported for OS '$(OS)' and architecture '$(TargetArchitecture)'." />
+  </Target>
+
   <!-- Running prerequisites -->
 
-  <Target Name="EnsurePrerequisites" Condition="'$(EnforcePrerequisites)' == 'True'" BeforeTargets="EnsureNodeJSRestored">
+  <Target Name="EnsurePrerequisites" Condition="'$(EnforcePrerequisites)' == 'true'" BeforeTargets="EnsureNodeJSRestored">
     <PropertyGroup>
       <_PackageJson>$(MSBuildProjectDirectory)\package.json</_PackageJson>
     </PropertyGroup>