Merge pull request #11020 from adiaaida/hardenPerf

[platform/upstream/coreclr.git] / buildpipeline / pipelines.json

diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json
index e6889f9..41a2640 100644 (file)
--- a/buildpipeline/pipelines.json
+++ b/buildpipeline/pipelines.json
@@ -103,19 +103,6 @@
         {
           "Name": "DotNet-CoreClr-Trusted-Linux",
           "Parameters": {
-            "DockerTag": "alpine_prereqs",
-            "Rid": "alpine.3.4.3"
-          },
-          "ReportingParameters": {
-            "OperatingSystem": "Alpine 3.4.3",
-            "Type": "build/product/",
-            "Architecture": "x64",
-            "PB_BuildType": null
-          }
-        },
-        {
-          "Name": "DotNet-CoreClr-Trusted-Linux",
-          "Parameters": {
             "DockerTag": "rhel7_prereqs_2",
             "portableBuild": "-portable",
             "Rid": "linux"
@@ -493,11 +480,11 @@
         {
           "Name": "Dotnet-CoreClr-Trusted-BuildTests",
           "Parameters": {
+            "HelixJobType": "test/functional/cli/",
             "TargetsWindows": "true",
             "Rid": "win-x64",
             "TargetQueues": "windows.10.amd64",
             "TestContainerSuffix": "windows",
-            "TargetsNonWindowsArg": " "
           },
           "ReportingParameters": {
             "OperatingSystem": "Windows",
@@ -509,11 +496,29 @@
         {
           "Name": "Dotnet-CoreClr-Trusted-BuildTests",
           "Parameters": {
+            "HelixJobType": "test/functional/r2r/cli/",
+            "TargetsWindows": "true",
+            "Rid": "win-x64",
+            "TargetQueues": "windows.10.amd64",
+            "TestContainerSuffix": "windows-r2r",
+            "CrossgenArg": "Crossgen "
+          },
+          "ReportingParameters": {
+            "OperatingSystem": "Windows",
+            "SubType":  "Build-Tests-R2R",
+            "Type": "build/product/",
+            "PB_BuildType": "Release"
+          }
+        },
+        {
+          "Name": "Dotnet-CoreClr-Trusted-BuildTests",
+          "Parameters": {
+            "HelixJobType": "test/functional/cli/",
             "TargetsWindows": "false",
             "Rid": "osx-x64",
             "TargetQueues": "osx.1012.amd64",
             "TestContainerSuffix": "osx",
-            "TargetsNonWindowsArg": "TargetsNonWindows"
+            "TargetsNonWindowsArg": "TargetsNonWindows "
           },
           "ReportingParameters": {
             "OperatingSystem": "OSX",
@@ -525,11 +530,12 @@
         {
           "Name": "Dotnet-CoreClr-Trusted-BuildTests",
           "Parameters": {
+            "HelixJobType": "test/functional/cli/",
             "TargetsWindows": "false",
             "Rid": "linux-x64",
             "TargetQueues": "debian.82.amd64,fedora.25.amd64,redhat.72.amd64,ubuntu.1404.amd64,ubuntu.1604.amd64,ubuntu.1610.amd64",
             "TestContainerSuffix": "linux",
-            "TargetsNonWindowsArg": "TargetsNonWindows"
+            "TargetsNonWindowsArg": "TargetsNonWindows "
           },
           "ReportingParameters": {
             "OperatingSystem": "RedHat 7",