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

Improve Linux arm32/arm64 corefx test runs #20107

Merged
merged 2 commits into from
Sep 25, 2018
Merged

Improve Linux arm32/arm64 corefx test runs #20107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a08d45d
Move run-tests.sh from corefx
BruceForstall Sep 21, 2018
07b8ea2
Improve Linux arm32/arm64 corefx test runs.
BruceForstall Sep 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions netci.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1586,10 +1586,8 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def
break
}
if (jobRequiresLimitedHardware(architecture, os)) {
if ((architecture == 'arm64') && (os == 'Ubuntu16.04') && !isCoreFxScenario(scenario)) {
if ((architecture == 'arm64') && (os == 'Ubuntu16.04')) {
// These jobs are very fast on Linux/arm64 hardware, so run them daily.
// TODO: When the corefx jobs are made to run in parallel, run those
// jobs daily as well.
addPeriodicTriggerHelper(job, '@daily')
}
else {
Expand Down Expand Up @@ -2487,7 +2485,6 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR

Utilities.addArchival(newJob, "${workspaceRelativeFxRootLinux}/fxruntime.zip")
Utilities.addArchival(newJob, "${workspaceRelativeFxRootLinux}/fxtests.zip")
Utilities.addArchival(newJob, "${workspaceRelativeFxRootLinux}/run-test.sh")
}
else if (isCrossGenComparisonScenario(scenario)) {
buildCommands += "${dockerCmd}\${WORKSPACE}/build-test.sh ${lowerConfiguration} ${architecture} cross generatelayoutonly"
Expand Down Expand Up @@ -3358,8 +3355,6 @@ def static CreateOtherTestJob(def dslFactory, def project, def branch, def archi
shell("mkdir -p ${workspaceRelativeFxRootLinux}")
shell("wget --progress=dot:giga --directory-prefix=${workspaceRelativeFxRootLinux} ${inputUrlRoot}/${workspaceRelativeFxRootLinux}/fxtests.zip")
shell("wget --progress=dot:giga --directory-prefix=${workspaceRelativeFxRootLinux} ${inputUrlRoot}/${workspaceRelativeFxRootLinux}/fxruntime.zip")
shell("wget --progress=dot:giga --directory-prefix=${workspaceRelativeFxRootLinux} ${inputUrlRoot}/${workspaceRelativeFxRootLinux}/run-test.sh")
shell("chmod +x ${workspaceRelativeFxRootLinux}/run-test.sh")
}
else {
shell("wget --progress=dot:giga ${inputUrlRoot}/testnativebin.${lowerConfiguration}.zip")
Expand Down Expand Up @@ -3455,7 +3450,7 @@ def static CreateOtherTestJob(def dslFactory, def project, def branch, def archi

if (doCoreFxTesting) {
shell("""\
\${WORKSPACE}/${workspaceRelativeFxRootLinux}/run-test.sh --sequential --test-exclude-file \${WORKSPACE}/tests/${architecture}/corefx_linux_test_exclusions.txt --runtime \${WORKSPACE}/${workspaceRelativeFxRootLinux}/bin/testhost/netcoreapp-Linux-Release-${architecture} --arch ${architecture} --corefx-tests \${WORKSPACE}/${workspaceRelativeFxRootLinux}/bin --configurationGroup Release""")
\${WORKSPACE}/tests/scripts/run-corefx-tests.sh --test-exclude-file \${WORKSPACE}/tests/${architecture}/corefx_linux_test_exclusions.txt --runtime \${WORKSPACE}/${workspaceRelativeFxRootLinux}/bin/testhost/netcoreapp-Linux-Release-${architecture} --arch ${architecture} --corefx-tests \${WORKSPACE}/${workspaceRelativeFxRootLinux}/bin --configurationGroup Release""")
}
else {
def runScript = "${dockerCmd}./tests/runtest.sh"
Expand Down
Loading