diff options
author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2019-01-17 16:21:41 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-17 16:21:41 -0800 |
commit | 00f8c81034543d7e100fe0ff687aaaace9775f80 (patch) | |
tree | 2292c95c5b2cecb5e81e5e2f8f86d0919d8c329f | |
parent | 5ee3f12023b070a777ceb09c8554b88eb8a2cd63 (diff) | |
download | coreclr-00f8c81034543d7e100fe0ff687aaaace9775f80.tar.gz coreclr-00f8c81034543d7e100fe0ff687aaaace9775f80.tar.bz2 coreclr-00f8c81034543d7e100fe0ff687aaaace9775f80.zip |
Unblock Azure DevOps-as-CI (#22042)
* Disable JIT.Methodical/doublearray/dblarray3_cs_do
* Disable readytorun.r2rdump/R2RDumpTest
* Disable RedHat.6.Amd64.Open queue
* Rename Creator coreclr/pulls -> coreclr-pulls
* IsExternal is deprecated as of https://github.com/dotnet/arcade build 20190115.6
* Increase timeout for all test jobs
-rw-r--r-- | azure-pipelines.yml | 12 | ||||
-rw-r--r-- | eng/platform-matrix.yml | 3 | ||||
-rw-r--r-- | eng/send-to-helix-step.yml | 3 | ||||
-rw-r--r-- | eng/test-job.yml | 7 | ||||
-rw-r--r-- | tests/helixpublishwitharcade.proj | 7 | ||||
-rw-r--r-- | tests/issues.targets | 12 |
6 files changed, 19 insertions, 25 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b337223e6b..f40bbad15f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -126,7 +126,7 @@ jobs: jobParameters: priority: 0 scenarios: 'normal,no_tiered_compilation' - timeoutInMinutes: 120 + timeoutInMinutes: 240 # Pri1 (CI) - ${{ if and(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI')) }}: @@ -137,7 +137,7 @@ jobs: jobParameters: priority: 1 scenarios: 'normal,no_tiered_compilation' - timeoutInMinutes: 240 + timeoutInMinutes: 360 # Pri1 crossgen (CI) - ${{ if and(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI')) }}: @@ -149,7 +149,7 @@ jobs: priority: 1 crossgen: true scenarios: 'normal,no_tiered_compilation' - timeoutInMinutes: 240 + timeoutInMinutes: 360 # Pri1 (Manual) - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'Manual')) }}: @@ -160,7 +160,7 @@ jobs: jobParameters: priority: 1 scenarios: 'normal,no_tiered_compilation,jitstress1,jitstress2,jitstress1_tiered,jitstress2_tiered' - timeoutInMinutes: 300 + timeoutInMinutes: 480 # # Release test builds (Official Build) @@ -174,8 +174,8 @@ jobs: buildConfig: release jobParameters: priority: 1 - timeoutInMinutes: 240 scenarios: 'normal,no_tiered_compilation' + timeoutInMinutes: 360 # Pri1 crossgen (Official Build) - ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}: @@ -186,8 +186,8 @@ jobs: jobParameters: priority: 1 crossgen: true - timeoutInMinutes: 240 scenarios: 'normal,no_tiered_compilation' + timeoutInMinutes: 360 # Publish build information to Build Assets Registry diff --git a/eng/platform-matrix.yml b/eng/platform-matrix.yml index d727ff7c05..a4303b2500 100644 --- a/eng/platform-matrix.yml +++ b/eng/platform-matrix.yml @@ -59,7 +59,8 @@ jobs: osGroup: Linux osIdentifier: Linux_rhel6 containerName: centos6_x64_build_image - helixQueuesPublic: 'RedHat.6.Amd64.Open' + # TODO: enable RedHat.6.Amd64.Open + # when https://github.com/dotnet/core-eng/issues/4100 is resolved helixQueuesInternal: 'RedHat.6.Amd64' ${{ insert }}: ${{ parameters.jobParameters }} diff --git a/eng/send-to-helix-step.yml b/eng/send-to-helix-step.yml index 631ca066bb..32cae4c040 100644 --- a/eng/send-to-helix-step.yml +++ b/eng/send-to-helix-step.yml @@ -4,7 +4,6 @@ parameters: archType: '' osGroup: '' buildConfig: '' - isExternal: '' creator: '' publishTestResults: '' helixAccessToken: '' @@ -25,7 +24,6 @@ steps: __BuildArch: ${{ parameters.archType }} __BuildOS: ${{ parameters.osGroup }} __BuildType: ${{ parameters.buildConfig }} - _IsExternal: ${{ parameters.isExternal }} _Creator: ${{ parameters.creator }} _PublishTestResults: ${{ parameters.publishTestResults }} _HelixAccessToken: ${{ parameters.helixAccessToken }} @@ -47,7 +45,6 @@ steps: __BuildArch: ${{ parameters.archType }} __BuildOS: ${{ parameters.osGroup }} __BuildType: ${{ parameters.buildConfig }} - _IsExternal: ${{ parameters.isExternal }} _Creator: ${{ parameters.creator }} _PublishTestResults: ${{ parameters.publishTestResults }} _HelixAccessToken: ${{ parameters.helixAccessToken }} diff --git a/eng/test-job.yml b/eng/test-job.yml index 82b000e8dd..bc9329fa01 100644 --- a/eng/test-job.yml +++ b/eng/test-job.yml @@ -130,18 +130,17 @@ jobs: timeoutInMinutes: 30 ${{ if eq(variables['System.TeamProject'], 'internal') }}: - isExternal: false # Access token variable for internal project from the # DotNet-HelixApi-Access variable group helixAccessToken: $(HelixApiAccessToken) helixQueues: ${{ parameters.helixQueuesInternal }} ${{ if eq(parameters.helixQueuesInternal, '') }}: condition: false + ${{ if eq(variables['System.TeamProject'], 'public') }}: - isExternal: true - creator: coreclr/pulls + creator: coreclr-pulls helixQueues: ${{ parameters.helixQueuesPublic }} ${{ if eq(parameters.helixQueuesPublic, '') }}: condition: false - scenarios: ${{ parameters.scenarios }} + scenarios: ${{ parameters.scenarios }}
\ No newline at end of file diff --git a/tests/helixpublishwitharcade.proj b/tests/helixpublishwitharcade.proj index bd67b04546..65341d3ac8 100644 --- a/tests/helixpublishwitharcade.proj +++ b/tests/helixpublishwitharcade.proj @@ -11,11 +11,8 @@ <HelixConfiguration Condition=" '$(Scenario)' == 'normal' ">$(BuildType)</HelixConfiguration> <HelixConfiguration Condition=" '$(Scenario)' != 'normal' ">$(BuildType)-$(Scenario)</HelixConfiguration> - <IsExternal>$(_IsExternal)</IsExternal> - <IsExternal Condition=" '$(IsExternal)' == '' ">true</IsExternal> - - <Creator Condition=" '$(IsExternal)' == 'true' ">$(_Creator)</Creator> - <HelixAccessToken Condition=" '$(IsExternal)' != 'true' ">$(_HelixAccessToken)</HelixAccessToken> + <Creator>$(_Creator)</Creator> + <HelixAccessToken>$(_HelixAccessToken)</HelixAccessToken> <HelixTargetQueues>$(_HelixTargetQueues)</HelixTargetQueues> <EnableAzurePipelinesReporter>$(_PublishTestResults)</EnableAzurePipelinesReporter> diff --git a/tests/issues.targets b/tests/issues.targets index 5f7c8e85af..9b6286b414 100644 --- a/tests/issues.targets +++ b/tests/issues.targets @@ -50,6 +50,9 @@ <ExcludeList Include="$(XunitTestBinBase)/baseservices/exceptions/StackTracePreserve/StackTracePreserveTests/*"> <Issue>20322</Issue> </ExcludeList> + <ExcludeList Include="$(XunitTestBinBase)/readytorun/r2rdump/R2RDumpTest/*"> + <Issue>19441;22020</Issue> + </ExcludeList> </ItemGroup> <!-- All Unix targets --> @@ -127,9 +130,6 @@ <ExcludeList Include="$(XunitTestBinBase)/GC/Regressions/dev10bugs/536168/536168/*"> <Issue>needs triage</Issue> </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)/readytorun/r2rdump/R2RDumpTest/*"> - <Issue>needs triage</Issue> - </ExcludeList> <ExcludeList Include="$(XunitTestBinBase)/GC/API/GC/GetAllocatedBytesForCurrentThread/*"> <Issue></Issue> </ExcludeList> @@ -233,9 +233,6 @@ <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/DevDiv_590771/DevDiv_590771/*"> <Issue>needs triage</Issue> </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)/readytorun/r2rdump/R2RDumpTest/*"> - <Issue>19441</Issue> - </ExcludeList> </ItemGroup> <ItemGroup Condition="'$(XunitTestBinBase)' != ''"> @@ -601,6 +598,9 @@ <ExcludeList Include="$(XunitTestBinBase)/GC/Scenarios/Dynamo/dynamo/*"> <Issue>17129</Issue> </ExcludeList> + <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray3_cs_do/*"> + <Issue>22015</Issue> + </ExcludeList> </ItemGroup> |