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 9ab0237..41a2640 100644 (file)
--- a/buildpipeline/pipelines.json
+++ b/buildpipeline/pipelines.json
@@ -103,25 +103,12 @@
         {
           "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"
           },
           "ReportingParameters": {
-            "OperatingSystem": "RedHat 7",
+            "OperatingSystem": "Linux",
             "Type": "build/product/",
             "Architecture": "x64",
             "PB_BuildType": null
@@ -146,7 +133,7 @@
             "portableBuild": "-portable"
           },
           "ReportingParameters": {
-            "OperatingSystem": "RedHat 7",
+            "OperatingSystem": "OSX",
             "Type": "build/product/",
             "SubType": "PortableBuild",
             "Architecture": "x64",
@@ -261,7 +248,7 @@
         {
           "Name": "DotNet-CoreClr-Trusted-Linux-Crossbuild",
           "Parameters": {
-            "DockerTag": "ubuntu1404_cross_prereqs_v2",
+            "DockerTag": "ubuntu-14.04-cross-0cd4667-20172211042239",
             "Architecture": "arm",
             "Rid": "ubuntu.14.04"
           },
@@ -276,13 +263,13 @@
         {
           "Name": "DotNet-CoreClr-Trusted-Linux-Crossbuild",
           "Parameters": {
-            "DockerTag": "ubuntu1404_cross_prereqs_v2",
+            "DockerTag": "ubuntu-14.04-cross-0cd4667-20172211042239",
             "Architecture": "arm",
             "portableBuild": "-portable",
             "Rid": "ubuntu.14.04"
           },
           "ReportingParameters": {
-            "OperatingSystem": "Ubuntu 14.04",
+            "OperatingSystem": "Linux",
             "SubType": "PortableCrossBuild",
             "Type": "build/product/",
             "Architecture": "arm",
@@ -292,7 +279,7 @@
         {
           "Name": "DotNet-CoreClr-Trusted-Linux-Crossbuild",
           "Parameters": {
-            "DockerTag": "ubuntu1604_cross_prereqs_v2",
+            "DockerTag": "ubuntu-16.04-cross-ef0ac75-20175511035548",
             "Architecture": "arm",
             "Rid": "ubuntu.16.04"
           },
@@ -493,14 +480,32 @@
         {
           "Name": "Dotnet-CoreClr-Trusted-BuildTests",
           "Parameters": {
+            "HelixJobType": "test/functional/cli/",
+            "TargetsWindows": "true",
+            "Rid": "win-x64",
+            "TargetQueues": "windows.10.amd64",
+            "TestContainerSuffix": "windows",
+          },
+          "ReportingParameters": {
+            "OperatingSystem": "Windows",
+            "SubType":  "Build-Tests",
+            "Type": "build/product/",
+            "PB_BuildType": "Release"
+          }
+        },
+        {
+          "Name": "Dotnet-CoreClr-Trusted-BuildTests",
+          "Parameters": {
+            "HelixJobType": "test/functional/r2r/cli/",
             "TargetsWindows": "true",
-            "Rid": "windows_nt-x64",
+            "Rid": "win-x64",
             "TargetQueues": "windows.10.amd64",
-            "TestContainerSuffix": "windows10",
-            "RuntimeIDArg": " "
+            "TestContainerSuffix": "windows-r2r",
+            "CrossgenArg": "Crossgen "
           },
           "ReportingParameters": {
             "OperatingSystem": "Windows",
+            "SubType":  "Build-Tests-R2R",
             "Type": "build/product/",
             "PB_BuildType": "Release"
           }
@@ -508,14 +513,16 @@
         {
           "Name": "Dotnet-CoreClr-Trusted-BuildTests",
           "Parameters": {
+            "HelixJobType": "test/functional/cli/",
             "TargetsWindows": "false",
-            "Rid": "osx.10.12-x64",
+            "Rid": "osx-x64",
             "TargetQueues": "osx.1012.amd64",
-            "TestContainerSuffix": "osx1012",
-            "RuntimeIDArg": "runtimeid osx.10.12-x64"
+            "TestContainerSuffix": "osx",
+            "TargetsNonWindowsArg": "TargetsNonWindows "
           },
           "ReportingParameters": {
             "OperatingSystem": "OSX",
+            "SubType":  "Build-Tests",
             "Type": "build/product/",
             "PB_BuildType": "Release"
           }
@@ -523,14 +530,16 @@
         {
           "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",
-            "RuntimeIDArg": "runtimeid linux-x64"
+            "TargetsNonWindowsArg": "TargetsNonWindows "
           },
           "ReportingParameters": {
             "OperatingSystem": "RedHat 7",
+            "SubType":  "Build-Tests",
             "Type": "build/product/",
             "PB_BuildType": "Release"
           }