Skip to content

Commit 6c94148

Browse files
authored
Remove tests from official builds (#23056)
* Remove tests from official builds - #22787 nit: _add_ dependency on Windows ARM64 build when publishing to the BAR - not a major problem because this particular build rarely if ever fails - the existence of the correct manifests is much more important * Address nit: `Windows_64_build` -> `Windows_arm64_build`
1 parent c4c6e25 commit 6c94148

File tree

1 file changed

+125
-127
lines changed

1 file changed

+125
-127
lines changed

.azure/pipelines/ci.yml

Lines changed: 125 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ stages:
246246
- template: jobs/default-build.yml
247247
parameters:
248248
codeSign: true
249-
jobName: Windows_64_build
249+
jobName: Windows_arm64_build
250250
jobDisplayName: "Build: Windows ARM64"
251251
agentOs: Windows
252252
buildArgs:
@@ -492,132 +492,133 @@ stages:
492492
parameters:
493493
inputName: Linux_musl_arm64
494494

495-
# Test jobs
496-
- template: jobs/default-build.yml
497-
parameters:
498-
condition: ne(variables['SkipTests'], 'true')
499-
jobName: Windows_Test
500-
jobDisplayName: "Test: Windows Server 2016 x64"
501-
agentOs: Windows
502-
isTestingJob: true
503-
buildArgs: -all -pack -test /p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true
504-
/p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false
505-
$(_InternalRuntimeDownloadArgs)
506-
beforeBuild:
507-
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
508-
displayName: Setup IISExpress test certificates and schema
509-
artifacts:
510-
- name: Windows_Test_Dumps
511-
path: artifacts/dumps/
512-
publishOnError: true
513-
includeForks: true
514-
- name: Windows_Test_Logs
515-
path: artifacts/log/
516-
publishOnError: true
517-
includeForks: true
518-
- name: Windows_Test_Results
519-
path: artifacts/TestResults/
520-
publishOnError: true
521-
includeForks: true
495+
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
496+
# Test jobs
497+
- template: jobs/default-build.yml
498+
parameters:
499+
condition: ne(variables['SkipTests'], 'true')
500+
jobName: Windows_Test
501+
jobDisplayName: "Test: Windows Server 2016 x64"
502+
agentOs: Windows
503+
isTestingJob: true
504+
buildArgs: -all -pack -test /p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true
505+
/p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false
506+
$(_InternalRuntimeDownloadArgs)
507+
beforeBuild:
508+
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
509+
displayName: Setup IISExpress test certificates and schema
510+
artifacts:
511+
- name: Windows_Test_Dumps
512+
path: artifacts/dumps/
513+
publishOnError: true
514+
includeForks: true
515+
- name: Windows_Test_Logs
516+
path: artifacts/log/
517+
publishOnError: true
518+
includeForks: true
519+
- name: Windows_Test_Results
520+
path: artifacts/TestResults/
521+
publishOnError: true
522+
includeForks: true
522523

523-
- template: jobs/default-build.yml
524-
parameters:
525-
condition: ne(variables['SkipTests'], 'true')
526-
jobName: Windows_Templates_Test
527-
jobDisplayName: "Test: Templates - Windows Server 2016 x64"
528-
agentOs: Windows
529-
isTestingJob: true
530-
steps:
531-
- script: ./build.cmd -ci -nobl -all -pack $(_InternalRuntimeDownloadArgs)
532-
displayName: Build Repo
533-
- script: ./src/ProjectTemplates/build.cmd -ci -nobl -noBuildRepoTasks -pack -NoRestore -noBuildNative -NoBuilddeps "/p:RunTemplateTests=true"
534-
displayName: Pack Templates
535-
- script: ./src/ProjectTemplates/build.cmd -ci -nobl -noBuildRepoTasks -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true"
536-
displayName: Test Templates
537-
artifacts:
538-
- name: Windows_Test_Templates_Dumps
539-
path: artifacts/dumps/
540-
publishOnError: true
541-
includeForks: true
542-
- name: Windows_Test_Templates_Logs
543-
path: artifacts/log/
544-
publishOnError: true
545-
includeForks: true
546-
- name: Windows_Test_Templates_Results
547-
path: artifacts/TestResults/
548-
publishOnError: true
549-
includeForks: true
524+
- template: jobs/default-build.yml
525+
parameters:
526+
condition: ne(variables['SkipTests'], 'true')
527+
jobName: Windows_Templates_Test
528+
jobDisplayName: "Test: Templates - Windows Server 2016 x64"
529+
agentOs: Windows
530+
isTestingJob: true
531+
steps:
532+
- script: ./build.cmd -ci -nobl -all -pack $(_InternalRuntimeDownloadArgs)
533+
displayName: Build Repo
534+
- script: ./src/ProjectTemplates/build.cmd -ci -nobl -noBuildRepoTasks -pack -NoRestore -noBuildNative -NoBuilddeps "/p:RunTemplateTests=true"
535+
displayName: Pack Templates
536+
- script: ./src/ProjectTemplates/build.cmd -ci -nobl -noBuildRepoTasks -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true"
537+
displayName: Test Templates
538+
artifacts:
539+
- name: Windows_Test_Templates_Dumps
540+
path: artifacts/dumps/
541+
publishOnError: true
542+
includeForks: true
543+
- name: Windows_Test_Templates_Logs
544+
path: artifacts/log/
545+
publishOnError: true
546+
includeForks: true
547+
- name: Windows_Test_Templates_Results
548+
path: artifacts/TestResults/
549+
publishOnError: true
550+
includeForks: true
550551

551-
- template: jobs/default-build.yml
552-
parameters:
553-
condition: ne(variables['SkipTests'], 'true')
554-
jobName: MacOS_Test
555-
jobDisplayName: "Test: macOS 10.14"
556-
agentOs: macOS
557-
isTestingJob: true
558-
buildArgs: --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
559-
beforeBuild:
560-
- bash: "./eng/scripts/install-nginx-mac.sh"
561-
displayName: Installing Nginx
562-
artifacts:
563-
- name: MacOS_Test_Logs
564-
path: artifacts/log/
565-
publishOnError: true
566-
includeForks: true
567-
- name: MacOS_Test_Results
568-
path: artifacts/TestResults/
569-
publishOnError: true
570-
includeForks: true
552+
- template: jobs/default-build.yml
553+
parameters:
554+
condition: ne(variables['SkipTests'], 'true')
555+
jobName: MacOS_Test
556+
jobDisplayName: "Test: macOS 10.14"
557+
agentOs: macOS
558+
isTestingJob: true
559+
buildArgs: --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
560+
beforeBuild:
561+
- bash: "./eng/scripts/install-nginx-mac.sh"
562+
displayName: Installing Nginx
563+
artifacts:
564+
- name: MacOS_Test_Logs
565+
path: artifacts/log/
566+
publishOnError: true
567+
includeForks: true
568+
- name: MacOS_Test_Results
569+
path: artifacts/TestResults/
570+
publishOnError: true
571+
includeForks: true
571572

572-
- template: jobs/default-build.yml
573-
parameters:
574-
condition: ne(variables['SkipTests'], 'true')
575-
jobName: Linux_Test
576-
jobDisplayName: "Test: Ubuntu 16.04 x64"
577-
agentOs: Linux
578-
isTestingJob: true
579-
useHostedUbuntu: false
580-
buildArgs: --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
581-
beforeBuild:
582-
- bash: "./eng/scripts/install-nginx-linux.sh"
583-
displayName: Installing Nginx
584-
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
585-
displayName: Increase inotify limit
586-
artifacts:
587-
- name: Linux_Test_Logs
588-
path: artifacts/log/
589-
publishOnError: true
590-
includeForks: true
591-
- name: Linux_Test_Results
592-
path: artifacts/TestResults/
593-
publishOnError: true
594-
includeForks: true
573+
- template: jobs/default-build.yml
574+
parameters:
575+
condition: ne(variables['SkipTests'], 'true')
576+
jobName: Linux_Test
577+
jobDisplayName: "Test: Ubuntu 16.04 x64"
578+
agentOs: Linux
579+
isTestingJob: true
580+
useHostedUbuntu: false
581+
buildArgs: --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
582+
beforeBuild:
583+
- bash: "./eng/scripts/install-nginx-linux.sh"
584+
displayName: Installing Nginx
585+
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
586+
displayName: Increase inotify limit
587+
artifacts:
588+
- name: Linux_Test_Logs
589+
path: artifacts/log/
590+
publishOnError: true
591+
includeForks: true
592+
- name: Linux_Test_Results
593+
path: artifacts/TestResults/
594+
publishOnError: true
595+
includeForks: true
595596

596-
# Helix x64
597-
- template: jobs/default-build.yml
598-
parameters:
599-
jobName: Helix_x64
600-
jobDisplayName: 'Tests: Helix x64'
601-
agentOs: Windows
602-
timeoutInMinutes: 180
603-
steps:
604-
# Build the shared framework
605-
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
606-
displayName: Build shared fx
607-
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
608-
displayName: Restore interop projects
609-
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildNative -projects eng\helix\helix.proj
610-
/p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true
611-
/p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
612-
displayName: Run build.cmd helix target
613-
env:
614-
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
615-
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
616-
artifacts:
617-
- name: Helix_logs
618-
path: artifacts/log/
619-
publishOnError: true
620-
includeForks: true
597+
# Helix x64
598+
- template: jobs/default-build.yml
599+
parameters:
600+
jobName: Helix_x64
601+
jobDisplayName: 'Tests: Helix x64'
602+
agentOs: Windows
603+
timeoutInMinutes: 180
604+
steps:
605+
# Build the shared framework
606+
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
607+
displayName: Build shared fx
608+
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
609+
displayName: Restore interop projects
610+
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildNative -projects eng\helix\helix.proj
611+
/p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true
612+
/p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
613+
displayName: Run build.cmd helix target
614+
env:
615+
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
616+
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
617+
artifacts:
618+
- name: Helix_logs
619+
path: artifacts/log/
620+
publishOnError: true
621+
includeForks: true
621622

622623
# Source build
623624
- job: Source_Build
@@ -675,18 +676,15 @@ stages:
675676
dependsOn:
676677
- Windows_build
677678
- Windows_arm_build
679+
- Windows_arm64_build
678680
- CodeSign_Xplat_MacOS_x64
679681
- CodeSign_Xplat_Linux_x64
680682
- CodeSign_Xplat_Linux_arm
681683
- CodeSign_Xplat_Linux_arm64
682684
- CodeSign_Xplat_Linux_musl_x64
683685
- CodeSign_Xplat_Linux_musl_arm64
684686
# In addition to the dependencies above, ensure the build was successful overall.
685-
- Linux_Test
686-
- MacOS_Test
687687
- Source_Build
688-
- Windows_Templates_Test
689-
- Windows_Test
690688
pool:
691689
vmImage: vs2017-win2016
692690
publishUsingPipelines: ${{ variables._PublishUsingPipelines }}

0 commit comments

Comments
 (0)