summaryrefslogtreecommitdiff
path: root/netci.groovy
diff options
context:
space:
mode:
authorBruce Forstall <Bruce_Forstall@msn.com>2018-11-01 11:44:51 -0700
committerBruce Forstall <Bruce_Forstall@msn.com>2018-11-01 11:44:51 -0700
commit1d5b230c91f273d11ad77d7d940a1420f4a7f396 (patch)
tree9e337625bedf9bfa6e9910ac140521b7c8a9ced0 /netci.groovy
parentdf0cd2cd2c026af3aff78206bed6b45429dc9e19 (diff)
downloadcoreclr-1d5b230c91f273d11ad77d7d940a1420f4a7f396.tar.gz
coreclr-1d5b230c91f273d11ad77d7d940a1420f4a7f396.tar.bz2
coreclr-1d5b230c91f273d11ad77d7d940a1420f4a7f396.zip
Fix PMI job triggers for x64 Linux
Also, convert asm from ZIP to tar on non-Windows.
Diffstat (limited to 'netci.groovy')
-rwxr-xr-xnetci.groovy15
1 files changed, 10 insertions, 5 deletions
diff --git a/netci.groovy b/netci.groovy
index 467774f77c..023098e365 100755
--- a/netci.groovy
+++ b/netci.groovy
@@ -1800,6 +1800,12 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
break
}
+ if (scenario == 'pmi_asm_diffs') {
+ // Everything is already set.
+ // No default triggers.
+ break
+ }
+
switch (os) {
// OpenSUSE, Debian & RedHat get trigger phrases for pri 0 build, and pri 1 build & test
case 'Debian8.4':
@@ -2397,11 +2403,9 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
// TODO: Add -target_branch and -commit_hash arguments based on GitHub variables.
buildCommands += "python -u \${WORKSPACE}/tests/scripts/run-pmi-diffs.py -arch ${architecture} -ci_arch ${architecture} -build_type ${configuration}"
- // ZIP up the asm
- buildCommands += "zip -r dasm.${os}.${architecture}.${configuration}.zip ./_/pmi/asm"
-
// Archive the asm
- Utilities.addArchival(newJob, "dasm.${os}.${architecture}.${configuration}.zip")
+ buildCommands += "tar -czf dasm.${os}.${architecture}.${configuration}.tgz ./_/pmi/asm"
+ Utilities.addArchival(newJob, "dasm.${os}.${architecture}.${configuration}.tgz")
break
}
@@ -2894,7 +2898,8 @@ def static shouldGenerateJob(def scenario, def isPR, def architecture, def confi
if (architecture == 'armem') {
return false
}
- // Currently, we don't support pmi_asm_diffs for Windows arm/arm64. Is is not in validArmWindowsScenarios.
+ // Currently, we don't support pmi_asm_diffs for Windows arm/arm64. We don't have a dotnet CLI available to
+ // build jitutils. The jobs are not in validArmWindowsScenarios.
if ((os == 'Windows_NT') && (architecture == 'arm' || architecture == 'arm64')) {
return false
}