Fix corefx folder for Tizen job
authorBruce Forstall <Bruce_Forstall@msn.com>
Tue, 6 Nov 2018 17:28:45 +0000 (09:28 -0800)
committerBruce Forstall <Bruce_Forstall@msn.com>
Tue, 6 Nov 2018 17:28:45 +0000 (09:28 -0800)
https://ci.dot.net/job/dotnet_coreclr/job/master/job/armel_cross_checked_tizen_innerloop_prtest/

Commit migrated from https://github.com/dotnet/coreclr/commit/05126bb441726cda23c0282e81068cd2a211f092

src/coreclr/netci.groovy

index 023098e..8bb7b47 100755 (executable)
@@ -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 \\
@@ -2998,7 +2998,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)
                                     }
@@ -3379,7 +3379,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)
@@ -3387,7 +3387,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) {