Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Commit

Permalink
Merge pull request #15727 from wtgodbe/fixCrossbuild
Browse files Browse the repository at this point in the history 
Make arguments in crossbuild.json consistent with other Linux job
  • Loading branch information
@wtgodbe
wtgodbe authored Feb 2, 2017
2 parents 2b4e1e4 + 9594cb2 commit c6f799e
Showing 1 changed file with 39 additions and 45 deletions.
84 changes: 39 additions & 45 deletions buildpipeline/DotNet-CoreFx-Trusted-Linux-Crossbuild.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "run --name $(DockerContainerName) $(DockerImageName) git clone $(GitHubRepo) $(GitHubDirectory)",
"arguments": "run --name $(PB_DockerContainerName) $(PB_DockerImageName) git clone $(PB_VsoCorefxGitUrl) $(PB_GitDirectory)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -67,7 +67,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "commit $(DockerContainerName) $(DockerContainerName)",
"arguments": "commit $(PB_DockerContainerName) $(PB_DockerContainerName)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -85,7 +85,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "rm $(DockerContainerName)",
"arguments": "rm $(PB_DockerContainerName)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -103,7 +103,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "run -w=\"$(GitHubDirectory)\" --name $(DockerContainerName) $(DockerContainerName) $(GitHubDirectory)/clean.sh",
"arguments": "run -w=\"$(PB_GitDirectory)\" --name $(PB_DockerContainerName) $(PB_DockerContainerName) $(PB_GitDirectory)/clean.sh",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -121,7 +121,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "commit $(DockerContainerName) $(DockerContainerName)",
"arguments": "commit $(PB_DockerContainerName) $(PB_DockerContainerName)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -139,7 +139,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "rm $(DockerContainerName)",
"arguments": "rm $(PB_DockerContainerName)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -157,7 +157,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "run -w=\"$(GitHubDirectory)\" --name $(DockerContainerName) $(DockerContainerName) git checkout $(Build.SourceVersion)",
"arguments": "run -w=\"$(PB_GitDirectory)\" --name $(PB_DockerContainerName) $(PB_DockerContainerName) git checkout $(Build.SourceVersion)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -175,7 +175,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "commit $(DockerContainerName) $(DockerContainerName)",
"arguments": "commit $(PB_DockerContainerName) $(PB_DockerContainerName)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -193,7 +193,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "rm $(DockerContainerName)",
"arguments": "rm $(PB_DockerContainerName)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -211,7 +211,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "run -w=\"$(GitHubDirectory)\" --name $(DockerContainerName) $(DockerContainerName) $(GitHubDirectory)/sync.sh -p -- /p:ArchGroup=$(PB_Architecture)",
"arguments": "run -w=\"$(PB_GitDirectory)\" --name $(PB_DockerContainerName) $(PB_DockerContainerName) $(PB_GitDirectory)/sync.sh -p -- /p:ArchGroup=$(PB_Architecture)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -229,7 +229,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "commit $(DockerContainerName) $(DockerContainerName)",
"arguments": "commit $(PB_DockerContainerName) $(PB_DockerContainerName)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -247,7 +247,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "rm $(DockerContainerName)",
"arguments": "rm $(PB_DockerContainerName)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -265,7 +265,7 @@
},
"inputs": {
"filename": "sudo",
"arguments": "docker run --privileged -w=$(GitHubDirectory) --name $(DockerContainerName) $(DockerContainerName) $(GitHubDirectory)/cross/build-rootfs.sh $(PB_Architecture) $(CrossToolsetVersion) $(SkipUnmount)",
"arguments": "docker run --privileged -w=$(PB_GitDirectory) --name $(PB_DockerContainerName) $(PB_DockerContainerName) $(PB_GitDirectory)/cross/build-rootfs.sh $(PB_Architecture) $(CrossToolsetVersion) $(SkipUnmount)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -283,7 +283,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "commit $(DockerContainerName) $(DockerContainerName)",
"arguments": "commit $(PB_DockerContainerName) $(PB_DockerContainerName)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -301,7 +301,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "rm $(DockerContainerName)",
"arguments": "rm $(PB_DockerContainerName)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -319,7 +319,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "run -w=\"$(GitHubDirectory)\" --name $(DockerContainerName) $(DockerContainerName) $(GitHubDirectory)/build.sh -buildArch=$(PB_Architecture) -$(PB_ConfigurationGroup)",
"arguments": "run -w=\"$(PB_GitDirectory)\" --name $(PB_DockerContainerName) $(PB_DockerContainerName) $(PB_GitDirectory)/build.sh -buildArch=$(PB_Architecture) -$(PB_ConfigurationGroup)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -337,7 +337,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "commit $(DockerContainerName) $(DockerContainerName)",
"arguments": "commit $(PB_DockerContainerName) $(PB_DockerContainerName)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -355,7 +355,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "rm $(DockerContainerName)",
"arguments": "rm $(PB_DockerContainerName)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -373,7 +373,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "run --privileged -w=\"$(GitHubDirectory)\" --name $(DockerContainerName) $(DockerContainerName) git clean -xdf $(GitHubDirectory)/cross/",
"arguments": "run --privileged -w=\"$(PB_GitDirectory)\" --name $(PB_DockerContainerName) $(PB_DockerContainerName) git clean -xdf $(PB_GitDirectory)/cross/",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -391,7 +391,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "commit $(DockerContainerName) $(DockerContainerName)",
"arguments": "commit $(PB_DockerContainerName) $(PB_DockerContainerName)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -409,7 +409,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "rm $(DockerContainerName)",
"arguments": "rm $(PB_DockerContainerName)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -427,7 +427,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "run -w=\"$(GitHubDirectory)\" --name $(DockerContainerName) $(DockerContainerName) $(GitHubDirectory)/publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(Label) -- /p:OverwriteOnPublish=true",
"arguments": "run -w=\"$(PB_GitDirectory)\" --name $(PB_DockerContainerName) $(PB_DockerContainerName) $(PB_GitDirectory)/publish-packages.sh -AzureAccount=$(PB_CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_Label) -verbose -- /p:OverwriteOnPublish=true",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -436,15 +436,15 @@
"enabled": true,
"continueOnError": false,
"alwaysRun": false,
"displayName": "Delete files from $(DockerCopyDest)",
"displayName": "Delete files from $(PB_DockerCopyDest)",
"timeoutInMinutes": 0,
"task": {
"id": "b7e8b412-0437-4065-9371-edc5881de25b",
"versionSpec": "1.*",
"definitionType": "task"
},
"inputs": {
"SourceFolder": "$(DockerCopyDest)",
"SourceFolder": "$(PB_DockerCopyDest)",
"Contents": "*"
}
},
Expand All @@ -461,7 +461,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "cp $(DockerContainerName):$(GitHubDirectory) $(DockerCopyDest)",
"arguments": "cp $(PB_DockerContainerName):$(PB_GitDirectory) $(PB_DockerCopyDest)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand All @@ -479,7 +479,7 @@
},
"inputs": {
"filename": "docker",
"arguments": "rm $(DockerContainerName)",
"arguments": "rm $(PB_DockerContainerName)",
"workingFolder": "",
"failOnStandardError": "false"
}
Expand Down Expand Up @@ -514,7 +514,7 @@
"definitionType": "task"
},
"inputs": {
"CopyRoot": "$(DockerCopyDest)/coreclr",
"CopyRoot": "$(PB_DockerCopyDest)/corefx",
"Contents": "**/*.log",
"ArtifactName": "BuildLogs",
"ArtifactType": "Container",
Expand Down Expand Up @@ -564,25 +564,26 @@
"PB_ConfigurationGroup": {
"value": "Release"
},
"GitHubRepo": {
"PB_VsoCorefxGitUrl": {
"value": "http://github.com/dotnet/corefx.git"
},
"GitHubDirectory": {
"PB_GitDirectory": {
"value": "/root/corefx"
},
"DockerContainerName": {
"PB_DockerContainerName": {
"value": "$(Build.BuildId)"
},
"DockerImageName": {
"value": "$(DockerRepository):$(PB_DockerTag)"
"PB_DockerImageName": {
"value": "$(PB_DockerRepository):$(PB_DockerTag)"
},
"DockerRepository": {
"PB_DockerRepository": {
"value": "chcosta/dotnetcore"
},
"PB_DockerTag": {
"value": "ubuntu1404_cross_prereqs_v1"
"value": "ubuntu1404_cross_prereqs_v1",
"allowOverride": true
},
"CloudDropAccountName": {
"PB_CloudDropAccountName": {
"value": "dotnetbuildoutput"
},
"CloudDropAccessToken": {
Expand All @@ -592,27 +593,20 @@
"OfficialBuildId": {
"value": "$(Build.BuildNumber)"
},
"Label": {
"PB_Label": {
"value": "$(Build.BuildNumber)"
},
"GitHubBranch": {
"value": "sni_plus_latestbuildtools"
},
"Priority": {
"value": "0"
},
"RepoAccessToken": {
"value": null,
"isSecret": true
},
"PB_Architecture": {
"value": "arm"
},
"CommitToCheckout": {
"SourceVersion": {
"value": "HEAD",
"allowOverride": true
},
"DockerCopyDest": {
"PB_DockerCopyDest": {
"value": "$(Build.BinariesDirectory)/docker_repo"
},
"portableLinux": {
Expand Down

0 comments on commit c6f799e

Please sign in to comment.