summaryrefslogtreecommitdiff
path: root/buildpipeline
diff options
context:
space:
mode:
Diffstat (limited to 'buildpipeline')
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json15
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Linux.json22
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json6
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Windows.json6
-rw-r--r--buildpipeline/DotNet-Trusted-Publish-Symbols.json2
-rw-r--r--buildpipeline/pipelines.json64
6 files changed, 102 insertions, 13 deletions
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json
index c5d84f4e4e..a975bbd85b 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json
@@ -49,7 +49,7 @@
},
"inputs": {
"filename": "docker",
- "arguments": "run --rm $(DockerCommonRunArgs) git clone $(GitHubRepo) $(GitHubDirectory)",
+ "arguments": "run --rm $(DockerCommonRunArgs) git clone $(VsoCoreClrGitUrl) $(GitHubDirectory)",
"workingFolder": "",
"failOnStandardError": "false"
}
@@ -408,6 +408,19 @@
},
"PB_CleanAgent": {
"value": "true"
+ },
+ "VsoAccountName": {
+ "value": "dn-bot"
+ },
+ "VsoCoreClrGitUrl": {
+ "value": "https://$(VsoAccountName):$(VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/$(VsoRepositoryName)/"
+ },
+ "VsoPassword": {
+ "value": null,
+ "isSecret": true
+ },
+ "VsoRepositoryName": {
+ "value": "DotNet-CoreCLR-Trusted"
}
},
"demands": [
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
index e7220d9f52..9c2b4af20f 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
@@ -49,7 +49,7 @@
},
"inputs": {
"filename": "docker",
- "arguments": "run --rm $(DockerCommonRunArgs) git clone $(GitHubRepo) $(GitHubDirectory)",
+ "arguments": "run --rm $(DockerCommonRunArgs) git clone $(VsoCoreClrGitUrl) $(GitHubDirectory)",
"workingFolder": "",
"failOnStandardError": "false"
}
@@ -121,7 +121,7 @@
},
"inputs": {
"filename": "docker",
- "arguments": "run --rm $(DockerCommonRunArgs) ./build.sh $(PB_BuildType) $(Architecture) skipnuget -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) -- /flp:\"v=diag\"",
+ "arguments": "run --rm $(DockerCommonRunArgs) ./build.sh $(PB_BuildType) $(Architecture) skipnuget -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) $(PB_AdditionalBuildArgs) -- /flp:\"v=diag\"",
"workingFolder": "",
"failOnStandardError": "false"
}
@@ -139,7 +139,7 @@
},
"inputs": {
"filename": "docker",
- "arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -- /p:OfficialBuildId=$(OfficialBuildId)",
+ "arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) $(PB_AdditionalBuildArgs) -- /p:OfficialBuildId=$(OfficialBuildId)",
"workingFolder": "",
"failOnStandardError": "false"
}
@@ -369,6 +369,22 @@
},
"PB_CleanAgent": {
"value": "true"
+ },
+ "PB_AdditionalBuildArgs": {
+ "value":""
+ },
+ "VsoAccountName": {
+ "value": "dn-bot"
+ },
+ "VsoCoreClrGitUrl": {
+ "value": "https://$(VsoAccountName):$(VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/$(VsoRepositoryName)/"
+ },
+ "VsoPassword": {
+ "value": null,
+ "isSecret": true
+ },
+ "VsoRepositoryName": {
+ "value": "DotNet-CoreCLR-Trusted"
}
},
"demands": [
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json b/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
index 8ec9054c63..a4d6566a98 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
@@ -86,7 +86,7 @@
},
"inputs": {
"filename": "build.cmd",
- "arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages -OfficialBuildId=$(OfficialBuildId) -skiprestore -Priority=$(Priority)",
+ "arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages $(PB_EnforcePGO) -OfficialBuildId=$(OfficialBuildId) -skiprestore -Priority=$(Priority)",
"workingFolder": "",
"failOnStandardError": "false"
}
@@ -294,6 +294,10 @@
"VsoPassword": {
"value": null,
"isSecret": true
+ },
+ "PB_EnforcePGO": {
+ "value": "",
+ "allowOverride": true
}
},
"retentionRules": [
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
index 6cf49de9a6..a97132b25e 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
@@ -86,7 +86,7 @@
},
"inputs": {
"filename": "build.cmd",
- "arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages toolset_dir C:\\tools\\clr -OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority) -skiprestore -disableoss -- /flp:\"v=diag\"",
+ "arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages $(PB_EnforcePGO) toolset_dir C:\\tools\\clr -OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority) -skiprestore -disableoss -- /flp:\"v=diag\"",
"workingFolder": "",
"failOnStandardError": "false"
}
@@ -284,6 +284,10 @@
},
"TeamName": {
"value": "DotNetCore"
+ },
+ "PB_EnforcePGO": {
+ "value": "",
+ "allowOverride": true
}
},
"retentionRules": [
diff --git a/buildpipeline/DotNet-Trusted-Publish-Symbols.json b/buildpipeline/DotNet-Trusted-Publish-Symbols.json
index edbb8c0749..a85b3f96e9 100644
--- a/buildpipeline/DotNet-Trusted-Publish-Symbols.json
+++ b/buildpipeline/DotNet-Trusted-Publish-Symbols.json
@@ -56,7 +56,7 @@
"scriptName": "",
"arguments": "-BuildType $(PB_BuildType) -SymPkgGlob $(PB_AzureContainerSymbolPackageGlob) -Branch $(SourceBranch)",
"workingFolder": "$(Pipeline.SourcesDirectory)",
- "inlineScript": "param($BuildType, $SymPkgGlob, $Branch)\nif ($BuildType -ne \"Release\") { exit }\n$archive = $Branch.StartsWith(\"release/\")\n\n$target = \"UnzipSymbolPackagesForPublish\"\nif ($archive) { $target = \"SubmitSymbolsRequest\" }\n\n.\\run.cmd build -- `\n/t:$target `\n/p:SymbolPackagesToPublishGlob=$SymPkgGlob `\n/p:ArchiveSymbols=$archive `\n/v:D",
+ "inlineScript": "param($BuildType, $SymPkgGlob, $Branch)\nif ($BuildType -ne \"Release\") { exit }\n$archive = $Branch.StartsWith(\"release/\")\n\n$target = \"GetAllSymbolFilesToPublish\"\nif ($archive) { $target = \"SubmitSymbolsRequest\" }\n\n.\\run.cmd build -- `\n/t:$target `\n/p:SymbolPackagesToPublishGlob=$SymPkgGlob `\n/p:ArchiveSymbols=$archive `\n/v:D",
"failOnStandardError": "true"
}
},
diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json
index fdb7d1a052..fc1df6ee13 100644
--- a/buildpipeline/pipelines.json
+++ b/buildpipeline/pipelines.json
@@ -24,6 +24,20 @@
}
},
{
+ "Name": "DotNet-CoreClr-Trusted-Linux",
+ "Parameters": {
+ "DockerTag": "centos-6-c8c9b08-20174310104313",
+ "Rid": "rhel.6",
+ "PB_AdditionalBuildArgs": "-portablebuild=false"
+ },
+ "ReportingParameters": {
+ "OperatingSystem": "RedHat6",
+ "Type": "build/product/",
+ "Architecture": "x64",
+ "PB_BuildType": null
+ }
+ },
+ {
"Name": "DotNet-CoreClr-Trusted-Mac",
"Parameters": {
"Rid": "osx"
@@ -118,7 +132,8 @@
"TreatWarningsAsErrors": "false"
},
"BuildParameters": {
- "PB_BuildType": "Release"
+ "PB_BuildType": "Release",
+ "PB_EnforcePGO": "enforcepgo"
},
"ReportingParameters": {
"PB_BuildType": "Release"
@@ -327,7 +342,7 @@
"HelixJobType": "test/functional/cli/",
"TargetsWindows": "true",
"Rid": "win-x64",
- "TargetQueues": "windows.10.amd64",
+ "TargetQueues": "Windows.10.Amd64,Windows.10.Nano.Amd64,Windows.10.Amd64.Core,Windows.7.Amd64,Windows.81.Amd64",
"TestContainerSuffix": "windows",
},
"ReportingParameters": {
@@ -343,7 +358,7 @@
"HelixJobType": "test/functional/r2r/cli/",
"TargetsWindows": "true",
"Rid": "win-x64",
- "TargetQueues": "windows.10.amd64",
+ "TargetQueues": "Windows.10.Amd64,Windows.10.Nano.Amd64,Windows.10.Amd64.Core,Windows.7.Amd64,Windows.81.Amd64",
"TestContainerSuffix": "windows-r2r",
"CrossgenArg": "Crossgen "
},
@@ -366,6 +381,7 @@
},
"ReportingParameters": {
"OperatingSystem": "Windows",
+ "Architecture": "arm64",
"SubType": "Build-Tests",
"Type": "build/product/",
"PB_BuildType": "Release"
@@ -384,6 +400,7 @@
},
"ReportingParameters": {
"OperatingSystem": "Windows",
+ "Architecture": "arm64",
"SubType": "Build-Tests-R2R",
"Type": "build/product/",
"PB_BuildType": "Release"
@@ -430,7 +447,7 @@
"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",
+ "TargetQueues": "debian.82.amd64,fedora.25.amd64,redhat.72.amd64,ubuntu.1404.amd64,ubuntu.1604.amd64,ubuntu.1710.amd64",
"TestContainerSuffix": "linux",
"TargetsNonWindowsArg": "TargetsNonWindows "
},
@@ -447,7 +464,7 @@
"HelixJobType": "test/functional/r2r/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",
+ "TargetQueues": "debian.82.amd64,fedora.25.amd64,redhat.72.amd64,ubuntu.1404.amd64,ubuntu.1604.amd64,ubuntu.1710.amd64",
"TestContainerSuffix": "linux-r2r",
"CrossgenArg": "Crossgen ",
"TargetsNonWindowsArg": "TargetsNonWindows "
@@ -458,7 +475,42 @@
"Type": "build/product/",
"PB_BuildType": "Release"
}
- }
+ },
+ {
+ "Name": "Dotnet-CoreClr-Trusted-BuildTests",
+ "Parameters": {
+ "HelixJobType": "test/functional/cli/",
+ "TargetsWindows": "false",
+ "Rid": "rhel.6-x64",
+ "TargetQueues": "redhat.69.amd64",
+ "TestContainerSuffix": "rhel6",
+ "TargetsNonWindowsArg": "TargetsNonWindows "
+ },
+ "ReportingParameters": {
+ "OperatingSystem": "RedHat6",
+ "SubType": "Build-Tests",
+ "Type": "build/product/",
+ "PB_BuildType": "Release"
+ }
+ },
+ {
+ "Name": "Dotnet-CoreClr-Trusted-BuildTests",
+ "Parameters": {
+ "HelixJobType": "test/functional/r2r/cli/",
+ "TargetsWindows": "false",
+ "Rid": "rhel.6-x64",
+ "TargetQueues": "redhat.69.amd64",
+ "TestContainerSuffix": "rhel6-r2r",
+ "CrossgenArg": "Crossgen ",
+ "TargetsNonWindowsArg": "TargetsNonWindows "
+ },
+ "ReportingParameters": {
+ "OperatingSystem": "RedHat6",
+ "SubType": "Build-Tests-R2R",
+ "Type": "build/product/",
+ "PB_BuildType": "Release"
+ }
+ }
],
"DependsOn": [
"Trusted-All-Release"