Skip to content

Commit 13c9de2

Browse files
committed
Add $(RunAllTests) variable.
1 parent 47fda85 commit 13c9de2

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

build-tools/automation/azure-pipelines.yaml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@ variables:
5353
HostedMac: Hosted Mac Internal
5454
HostedWinVS2019: Hosted Windows 2019 with VS2019
5555
VSEngWinVS2019: VSEng-Xamarin-Android
56+
# Run all tests if:
57+
# - User who queued the job requested it (They set XA.RunAllTests to true)
58+
# - This is the master integration branch (Pipeline defaults XA.RunAllTests to true)
59+
# - This is a non-fork branch with name containing "mono-" (for Mono bumps)
60+
IsMonoBranch: $[and(eq(variables['XA.Commercial.Build'], 'true'), ne(variables['System.PullRequest.IsFork'], 'True'), contains(variables['Build.SourceBranchName'], 'mono-'))]
61+
RunAllTests: $[or(eq(variables['XA.RunAllTests'], true), eq(variables['IsMonoBranch'], true))]
5662

5763
# Stage and Job "display names" are shortened because they are combined to form the name of the corresponding GitHub check.
5864
stages:
@@ -939,12 +945,12 @@ stages:
939945
- stage: integrated_regression_test
940946
displayName: Regression Tests
941947
dependsOn: mac_build
942-
condition: and(eq(variables['XA.Commercial.Build'], 'true'), ne(variables['System.PullRequest.IsFork'], 'True'))
948+
condition: eq(variables['RunAllTests'], true)
943949
jobs:
944950

945951
# Check - "Xamarin.Android (Test Integrated Regression - macOS)"
946952
- job: integrated_regression_mac_1
947-
displayName: macOS - Node 1
953+
displayName: Mac-1
948954
pool:
949955
name: VSEng-Xamarin-Mac-Devices
950956
demands:
@@ -960,7 +966,7 @@ stages:
960966

961967
# Check - "Xamarin.Android (Test Integrated Regression - macOS)"
962968
- job: integrated_regression_mac_2
963-
displayName: macOS - Node 2
969+
displayName: Mac-2
964970
pool:
965971
name: VSEng-Xamarin-Mac-Devices
966972
demands:
@@ -976,7 +982,7 @@ stages:
976982

977983
# Check - "Xamarin.Android (Test Integrated Regression - macOS)"
978984
- job: integrated_regression_mac_3
979-
displayName: macOS - Node 3
985+
displayName: Mac-3
980986
pool:
981987
name: VSEng-Xamarin-Mac-Devices
982988
demands:
@@ -992,7 +998,7 @@ stages:
992998

993999
# Check - "Xamarin.Android (Test Integrated Regression - Windows)"
9941000
- job: integrated_regression_Win_1
995-
displayName: Windows - Node 1
1001+
displayName: Windows-1
9961002
pool:
9971003
name: VSEng-Xamarin-Win-XMA
9981004
demands:
@@ -1014,7 +1020,7 @@ stages:
10141020

10151021
# Check - "Xamarin.Android (Test Integrated Regression - Windows)"
10161022
- job: integrated_regression_Win_2
1017-
displayName: Windows - Node 2
1023+
displayName: Windows-2
10181024
pool:
10191025
name: VSEng-Xamarin-Win-XMA
10201026
demands:
@@ -1036,7 +1042,7 @@ stages:
10361042

10371043
# Check - "Xamarin.Android (Test Integrated Regression - Windows)"
10381044
- job: integrated_regression_Win_3
1039-
displayName: Windows - Node 3
1045+
displayName: Windows-3
10401046
pool:
10411047
name: VSEng-Xamarin-Win-XMA
10421048
demands:

build-tools/automation/yaml-templates/run-timezoneinfo-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ parameters:
55

66
jobs:
77
- job: mac_timezoneinfo_tests_${{ parameters.node_id }}
8-
displayName: TimeZoneInfo - macOS - ${{ parameters.node_id }}
8+
displayName: TimeZone - Mac-${{ parameters.node_id }}
99
pool: $(HostedMac)
1010
timeoutInMinutes: 90
1111
cancelTimeoutInMinutes: 5

0 commit comments

Comments
 (0)