summaryrefslogtreecommitdiff
path: root/eng
diff options
context:
space:
mode:
authorEgor Chesakov <Egor.Chesakov@microsoft.com>2019-01-17 16:21:41 -0800
committerGitHub <noreply@github.com>2019-01-17 16:21:41 -0800
commit00f8c81034543d7e100fe0ff687aaaace9775f80 (patch)
tree2292c95c5b2cecb5e81e5e2f8f86d0919d8c329f /eng
parent5ee3f12023b070a777ceb09c8554b88eb8a2cd63 (diff)
downloadcoreclr-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
Diffstat (limited to 'eng')
-rw-r--r--eng/platform-matrix.yml3
-rw-r--r--eng/send-to-helix-step.yml3
-rw-r--r--eng/test-job.yml7
3 files changed, 5 insertions, 8 deletions
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