Skip to content

[WIP] ANCM + Arm64 + helix #39420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HaoK wants to merge 17 commits into from
+49 −5
Closed

[WIP] ANCM + Arm64 + helix #39420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
05c974c
Add back arm64 job
HaoK Jan 10, 2022
cc2a768
Build on windows
HaoK Jan 10, 2022
4325d99
Update helix-matrix.yml
HaoK Jan 10, 2022
e2103bc
Skip all but windows arm queue
HaoK Jan 10, 2022
b96eaa2
Update Helix.Common.props
HaoK Jan 10, 2022
4d33ccb
Update Helix.Common.props
HaoK Jan 10, 2022
7232422
Update Helix.Common.props
HaoK Jan 11, 2022
d6e76ec
Update helix-matrix.yml
HaoK Jan 11, 2022
e5b4bc3
Update Helix.Common.props
HaoK Jan 11, 2022
cc86099
Update helix-matrix.yml
HaoK Jan 11, 2022
b408761
Update helix-matrix.yml
HaoK Jan 11, 2022
7274deb
Update helix-matrix.yml
HaoK Jan 11, 2022
c0045b6
Update helix-matrix.yml
HaoK Jan 12, 2022
ee0a47e
Update Helix.Common.props
HaoK Jan 12, 2022
6c14f1c
Move windows arm 64 queue to its own thing
HaoK Jan 13, 2022
79afe87
Set flag
HaoK Jan 13, 2022
3b8dcb9
Update Helix.Common.props
HaoK Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 43 additions & 1 deletion .azure/pipelines/helix-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# We only want to run full helix matrix on main
pr: none
pr:
Copy link
Copy Markdown
Member Author

@HaoK HaoK Jan 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert

autoCancel: true
branches:
include:
- '*'
trigger: none
schedules:
# Cron timezone is UTC.
Expand Down Expand Up @@ -48,3 +52,41 @@ jobs:
- name: Helix_logs
path: artifacts/log/
publishOnError: true

# Helix ARM64
- ${{ if ne(variables['System.TeamProject'], 'internal') }}:
Copy link
Copy Markdown
Contributor

@dougbu dougbu Jan 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do this only for public runs e.g. are you dealing w/ another missing internal Helix queue❔ aspnetcore-helix-matrix-internal is disabled in any case.

Copy link
Copy Markdown
Member Author

@HaoK HaoK Jan 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just copied this from the PR that deleted this job and brought it back, perhaps there are changes that were done since, so we can drop the condition now?

- template: jobs/default-build.yml
parameters:
jobName: Helix_matrix_arm64
jobDisplayName: "Tests: Helix ARM64 matrix"
agentOs: Windows
timeoutInMinutes: 480
steps:
- script: ./eng/build.cmd
-ci
-arch x64
-pack
-all
displayName: Build x64/arm64
Copy link
Copy Markdown
Contributor

@dougbu dougbu Jan 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need /p:CrossgenOutput=false here too; might need it in the next build step as well

# Build the arm64 shared framework
- script: ./eng/build.cmd
-ci
-arch arm64
-pack
-noBuildJava
-noBuildNative
/p:OnlyPackPlatformSpecificPackages=true
displayName: Build ARM64 shared fx
- script: .\eng\build.cmd -ci -arch arm64 -noBuildRepoTasks -NoRestore -test -all
-projects eng\helix\helix.proj /p:IsHelixWindowsArmCheck=true
/p:IsHelixJob=true /p:RunTemplateTests=true
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
Copy link
Copy Markdown
Contributor

@dougbu dougbu Jan 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally, be consistent w/ property settings in all three build steps. This line appears multiple times in the other job for example.

displayName: Run build.cmd helix target
env:
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
artifacts:
- name: Helix_arm64_logs
path: artifacts/log/
publishOnError: true
includeForks: true
10 changes: 6 additions & 4 deletions eng/targets/Helix.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@
<HelixAvailableTargetQueue Include="Windows.Amd64.Server2022.Open" Platform="Windows" />
</ItemGroup>
</When>
<When Condition=" '$(IsHelixWindowsArmCheck)' == 'true' ">
<ItemGroup>
<!-- aspnetcore-helix-matrix[-internal] (helix-matrix.yml) arm64 job -->
<HelixAvailableTargetQueue Include="Windows.10.Arm64v8.Open" Platform="Windows" />
</ItemGroup>
</When>
<Otherwise>
<!-- aspnetcore-helix-matrix[-internal] (helix-matrix.yml) and RunHelix.ps1 -->
<!-- aspnetcore-quarantined-tests (quarantined-tests.yml) and RunHelix.ps1 -RunQuarantinedTests -->
Expand All @@ -54,10 +60,6 @@
<!-- Windows -->
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Server20H2.Open" Platform="Windows" />
<HelixAvailableTargetQueue Include="Windows.Amd64.Server2022.Open" Platform="Windows" />

<!-- IIS Express isn't supported on arm64 and most of the IsWindowsOnlyTests depend on its setup scripts. -->
<HelixAvailableTargetQueue Include="Windows.10.Arm64v8.Open" Platform="Windows"
Condition=" '$(IsWindowsOnlyTest)' != 'true' "/>
</ItemGroup>
</Otherwise>
</Choose>
Expand Down