summaryrefslogtreecommitdiff
path: root/buildpipeline
diff options
context:
space:
mode:
authorWes Haggard <weshaggard@users.noreply.github.com>2018-03-30 11:59:39 -0700
committerGitHub <noreply@github.com>2018-03-30 11:59:39 -0700
commitf5720eea7e7ada0bc0f6ba05a3825c73871a8b81 (patch)
treea43d3016ce6dbe8024d171bd4dd9b9a90c3684c9 /buildpipeline
parentd845ef1c33f0283d18541714ad9469a7b1a559e6 (diff)
parent3365ac5efe5d6a7ea965ed1d17a5dd5474a033a5 (diff)
downloadcoreclr-f5720eea7e7ada0bc0f6ba05a3825c73871a8b81.tar.gz
coreclr-f5720eea7e7ada0bc0f6ba05a3825c73871a8b81.tar.bz2
coreclr-f5720eea7e7ada0bc0f6ba05a3825c73871a8b81.zip
Merge pull request #17347 from weshaggard/MergeMaster21
[release/2.1] Merge master to release/2.1
Diffstat (limited to 'buildpipeline')
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json39
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Linux.json23
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json14
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Windows.json14
-rw-r--r--buildpipeline/DotNet-Trusted-Publish-Symbols.json14
-rw-r--r--buildpipeline/DotNet-Trusted-Publish.json16
-rw-r--r--buildpipeline/pipelines.json8
-rw-r--r--buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json14
8 files changed, 73 insertions, 69 deletions
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json
index 04a837f8a6..a278d1b433 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json
@@ -155,7 +155,7 @@
},
"inputs": {
"filename": "docker",
- "arguments": "run --rm -e ROOTFS_DIR $(DockerCommonRunArgs) ./build.sh $(PB_BuildType) $(Architecture) skipnuget cross -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) -- /flp:\"v=diag\"",
+ "arguments": "run --rm -e ROOTFS_DIR=$(ROOTFS_DIR) -e CAC_ROOTFS_DIR=$(CAC_ROOTFS_DIR) $(DockerCommonRunArgs) ./build.sh $(PB_BuildType) $(Architecture) skipnuget cross $(CrossArchBuildArgs) -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) -- /flp:\"v=diag\"",
"workingFolder": "",
"failOnStandardError": "false"
}
@@ -175,7 +175,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) $(CrossArchBuildPackagesArgs) -- /p:OfficialBuildId=$(OfficialBuildId)",
"workingFolder": "",
"failOnStandardError": "false"
}
@@ -367,27 +367,6 @@
"workingFolder": "",
"failOnStandardError": "false"
}
- },
- {
- "environment": {},
- "enabled": true,
- "continueOnError": true,
- "alwaysRun": false,
- "displayName": "Cleanup VSTS Agent",
- "timeoutInMinutes": 0,
- "condition": "always()",
- "refName": "Task17",
- "task": {
- "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
- "versionSpec": "1.*",
- "definitionType": "task"
- },
- "inputs": {
- "filename": "$(Build.SourcesDirectory)/Tools/msbuild.sh",
- "arguments": "cleanupagent.proj /p:AgentDirectory=$(Agent.HomeDirectory) /p:DoClean=$(PB_CleanAgent)",
- "workingFolder": "$(Build.SourcesDirectory)/Tools/scripts/vstsagent/",
- "failOnStandardError": "false"
- }
}
],
"options": [
@@ -479,6 +458,14 @@
"Architecture": {
"value": "arm"
},
+ "CrossArchBuildArgs": {
+ "value": "",
+ "allowOverride": true
+ },
+ "CrossArchBuildPackagesArgs": {
+ "value": "",
+ "allowOverride": true
+ },
"CommitToCheckout": {
"value": "HEAD",
"allowOverride": true
@@ -489,6 +476,10 @@
"ROOTFS_DIR": {
"value": "/crossrootfs/$(Architecture)"
},
+ "CAC_ROOTFS_DIR": {
+ "value": "",
+ "allowOverride": true
+ },
"DockerVolumeName": {
"value": "coreclr-cross-$(Build.BuildId)"
},
@@ -579,4 +570,4 @@
"revision": 418098432,
"visibility": "organization"
}
-} \ No newline at end of file
+}
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
index 1b13a3c743..077b68b5de 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
@@ -327,27 +327,6 @@
"workingFolder": "",
"failOnStandardError": "false"
}
- },
- {
- "environment": {},
- "enabled": true,
- "continueOnError": true,
- "alwaysRun": false,
- "displayName": "Cleanup VSTS Agent",
- "timeoutInMinutes": 0,
- "condition": "always()",
- "refName": "Task15",
- "task": {
- "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
- "versionSpec": "1.*",
- "definitionType": "task"
- },
- "inputs": {
- "filename": "$(Build.SourcesDirectory)/Tools/msbuild.sh",
- "arguments": "cleanupagent.proj /p:AgentDirectory=$(Agent.HomeDirectory) /p:DoClean=$(PB_CleanAgent)",
- "workingFolder": "$(Build.SourcesDirectory)/Tools/scripts/vstsagent/",
- "failOnStandardError": "false"
- }
}
],
"options": [
@@ -539,4 +518,4 @@
"revision": 418098432,
"visibility": "organization"
}
-} \ No newline at end of file
+}
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json b/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
index b451efff39..ad596adde4 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
@@ -403,11 +403,17 @@
"quality": "definition",
"drafts": [],
"queue": {
- "id": 36,
- "name": "DotNet-Build",
+ "_links": {
+ "self": {
+ "href": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330"
+ }
+ },
+ "id": 330,
+ "name": "DotNetCore-Build",
+ "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330",
"pool": {
- "id": 39,
- "name": "DotNet-Build"
+ "id": 97,
+ "name": "DotNetCore-Build"
}
},
"id": 1828,
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
index a0ed7b71c2..39b4e2a293 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
@@ -396,11 +396,17 @@
"quality": "definition",
"drafts": [],
"queue": {
- "id": 36,
- "name": "DotNet-Build",
+ "_links": {
+ "self": {
+ "href": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330"
+ }
+ },
+ "id": 330,
+ "name": "DotNetCore-Build",
+ "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330",
"pool": {
- "id": 39,
- "name": "DotNet-Build"
+ "id": 97,
+ "name": "DotNetCore-Build"
}
},
"id": 1676,
diff --git a/buildpipeline/DotNet-Trusted-Publish-Symbols.json b/buildpipeline/DotNet-Trusted-Publish-Symbols.json
index 617fff0516..d796a21c93 100644
--- a/buildpipeline/DotNet-Trusted-Publish-Symbols.json
+++ b/buildpipeline/DotNet-Trusted-Publish-Symbols.json
@@ -250,11 +250,17 @@
"processParameters": {},
"quality": "definition",
"queue": {
- "id": 36,
- "name": "DotNet-Build",
+ "_links": {
+ "self": {
+ "href": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330"
+ }
+ },
+ "id": 330,
+ "name": "DotNetCore-Build",
+ "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330",
"pool": {
- "id": 39,
- "name": "DotNet-Build"
+ "id": 97,
+ "name": "DotNetCore-Build"
}
},
"id": -1,
diff --git a/buildpipeline/DotNet-Trusted-Publish.json b/buildpipeline/DotNet-Trusted-Publish.json
index 3eca08ae29..d0a26190e7 100644
--- a/buildpipeline/DotNet-Trusted-Publish.json
+++ b/buildpipeline/DotNet-Trusted-Publish.json
@@ -585,7 +585,7 @@
"allowOverride": true
},
"BuildConfiguration": {
- "value": "release"
+ "value": "Release"
},
"BuildPlatform": {
"value": "any cpu"
@@ -737,11 +737,17 @@
"quality": "definition",
"drafts": [],
"queue": {
- "id": 36,
- "name": "DotNet-Build",
+ "_links": {
+ "self": {
+ "href": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330"
+ }
+ },
+ "id": 330,
+ "name": "DotNetCore-Build",
+ "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330",
"pool": {
- "id": 39,
- "name": "DotNet-Build"
+ "id": 97,
+ "name": "DotNetCore-Build"
}
},
"id": 2943,
diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json
index b38243fdcc..94370eda93 100644
--- a/buildpipeline/pipelines.json
+++ b/buildpipeline/pipelines.json
@@ -130,9 +130,13 @@
{
"Name": "DotNet-CoreClr-Trusted-Linux-Crossbuild",
"Parameters": {
- "DockerTag": "ubuntu-14.04-cross-0cd4667-20170319080304",
+ "DockerTag": "ubuntu-14.04-cross-e435274-20180323032140",
"Architecture": "arm",
- "Rid": "linux"
+ "Rid": "linux",
+ "CrossArchitecture": "x86",
+ "CrossArchBuildArgs": "crosscomponent",
+ "CrossArchBuildPackagesArgs": "-__DoCrossArchBuild=1",
+ "CAC_ROOTFS_DIR": "/crossrootfs/$(CrossArchitecture)"
},
"ReportingParameters": {
"OperatingSystem": "Linux",
diff --git a/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json b/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json
index 58c2b7eda2..58a6b80c12 100644
--- a/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json
+++ b/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json
@@ -402,11 +402,17 @@
"quality": "definition",
"drafts": [],
"queue": {
- "id": 36,
- "name": "DotNet-Build",
+ "_links": {
+ "self": {
+ "href": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330"
+ }
+ },
+ "id": 330,
+ "name": "DotNetCore-Build",
+ "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330",
"pool": {
- "id": 39,
- "name": "DotNet-Build"
+ "id": 97,
+ "name": "DotNetCore-Build"
}
},
"id": 5159,