@@ -156,16 +156,14 @@ extends:
156156
157157 #
158158 # CoreCLR NativeAOT checked build and Pri0 tests
159- # Only when CoreCLR is changed
159+ # windows_x64 is tested with CET and CFG in a separate job
160160 #
161161 - template : /eng/pipelines/common/platform-matrix.yml
162162 parameters :
163163 jobTemplate : /eng/pipelines/common/global-build-job.yml
164164 helixQueuesTemplate : /eng/pipelines/coreclr/templates/helix-queues-setup.yml
165- helixQueueGroup : cet
166165 buildConfig : Checked
167166 platforms :
168- - windows_x64
169167 - windows_x86
170168 - linux_x64
171169 - linux_arm
@@ -190,3 +188,37 @@ extends:
190188 parameters :
191189 testGroup : innerloop
192190 liveLibrariesBuildConfig : Release
191+
192+ #
193+ # CoreCLR NativeAOT checked build and Pri0 tests
194+ # Test windows_x64 with CET and CFG
195+ #
196+ - template : /eng/pipelines/common/platform-matrix.yml
197+ parameters :
198+ jobTemplate : /eng/pipelines/common/global-build-job.yml
199+ helixQueuesTemplate : /eng/pipelines/coreclr/templates/helix-queues-setup.yml
200+ helixQueueGroup : cet
201+ buildConfig : Checked
202+ platforms :
203+ - windows_x64
204+ variables :
205+ - name : timeoutPerTestInMinutes
206+ value : 60
207+ - name : timeoutPerTestCollectionInMinutes
208+ value : 180
209+ jobParameters :
210+ timeoutInMinutes : 300 # doesn't normally take this long, but we have had Helix queues backed up for over an hour
211+ nameSuffix : NativeAOT_Pri0
212+ buildArgs : -s clr.aot+libs -rc $(_BuildConfig) -lc Release /p:RunAnalyzers=false
213+ postBuildSteps :
214+ - template : /eng/pipelines/coreclr/nativeaot-post-build-steps.yml
215+ parameters :
216+ creator : dotnet-bot
217+ testBuildArgs : ' nativeaot /p:IlcUseServerGc=false /p:ControlFlowGuard=Guard'
218+ liveLibrariesBuildConfig : Release
219+ testRunNamePrefixSuffix : NativeAOT_Pri0_$(_BuildConfig)
220+ extraVariablesTemplates :
221+ - template : /eng/pipelines/common/templates/runtimes/test-variables.yml
222+ parameters :
223+ testGroup : innerloop
224+ liveLibrariesBuildConfig : Release
0 commit comments