diff options
| author | Bruce Forstall <brucefo@microsoft.com> | 2018-11-06 09:52:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-06 09:52:29 -0800 |
| commit | 39dc64dfb50e374162aa263514f9ad1a46061f0d (patch) | |
| tree | a7f79b788a97a6e8e362448b50097514492a3e18 /netci.groovy | |
| parent | 5c566d470db2f1be687e6da5f9935960d482bf72 (diff) | |
| parent | 05126bb441726cda23c0282e81068cd2a211f092 (diff) | |
| download | coreclr-39dc64dfb50e374162aa263514f9ad1a46061f0d.tar.gz coreclr-39dc64dfb50e374162aa263514f9ad1a46061f0d.tar.bz2 coreclr-39dc64dfb50e374162aa263514f9ad1a46061f0d.zip | |
Merge pull request #20834 from BruceForstall/FixArmElJob
Fix corefx folder for Tizen job
Diffstat (limited to 'netci.groovy')
| -rwxr-xr-x | netci.groovy | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/netci.groovy b/netci.groovy index 13359598a3..1e468e86b3 100755 --- a/netci.groovy +++ b/netci.groovy @@ -2493,7 +2493,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR // Unpack the corefx binaries buildCommands += "mkdir ./bin/CoreFxBinDir" - buildCommands += "tar -xf ./bin/build.tar.gz -C ./bin/CoreFxBinDir" + buildCommands += "tar -xf ./artifacts/bin/build.tar.gz -C ./bin/CoreFxBinDir" // Call the ARM CI script to cross build and test using docker buildCommands += """./tests/scripts/arm32_ci_script.sh \\ @@ -3000,7 +3000,7 @@ Constants.allScenarios.each { scenario -> } } copyArtifacts("${corefxFolder}/${corefx_os}_${arm_abi}_cross_${corefx_lowerConfiguration}") { - includePatterns('bin/build.tar.gz') + includePatterns('artifacts/bin/build.tar.gz') buildSelector { latestSuccessful(true) } @@ -3383,7 +3383,7 @@ def static CreateOtherTestJob(def dslFactory, def project, def branch, def archi def corefxFolder = Utilities.getFolderName('dotnet/corefx') + '/' + Utilities.getFolderName(fxBranch) copyArtifacts("${corefxFolder}/ubuntu16.04_x86_release") { - includePatterns('bin/build.tar.gz') + includePatterns('artifacts/bin/build.tar.gz') targetDirectory('bin/CoreFxNative') buildSelector { latestSuccessful(true) @@ -3391,7 +3391,7 @@ def static CreateOtherTestJob(def dslFactory, def project, def branch, def archi } shell("mkdir ./bin/CoreFxBinDir") - shell("tar -xf ./bin/CoreFxNative/bin/build.tar.gz -C ./bin/CoreFxBinDir") + shell("tar -xf ./bin/CoreFxNative/artifacts/bin/build.tar.gz -C ./bin/CoreFxBinDir") } if (isPmiAsmDiffsScenario) { |