Migrate tools to jsonnet.

This commit is contained in:
Fabio Niephaus 2021-10-28 11:39:40 +02:00
parent c0ee5b44f3
commit a6917b4ae0
No known key found for this signature in database
GPG Key ID: F21CF5275F31DFD6
4 changed files with 86 additions and 82 deletions

View File

@ -15,9 +15,6 @@ logPatterns = [
${compiler-suite-root}"/graal_dumps/*/*"
]
#Tools
include "tools/ci.hocon"
#Examples
#Examples gate also disabled.
#include "examples/ci.hocon"

View File

@ -16,6 +16,9 @@ local sdk = import 'sdk/ci.jsonnet';
# Sulong
local sulong = import 'sulong/ci.jsonnet';
# Tools
local tools = import 'tools/ci.jsonnet';
# JavaDoc
local javadoc = import "ci_includes/publish-javadoc.jsonnet";
@ -39,6 +42,7 @@ local add_excludes_guard(build) = build + {
regex.builds +
sdk.builds +
sulong.builds +
tools.builds +
javadoc.builds
)]
}

View File

@ -1,79 +0,0 @@
toolsCommon: {
setup : [
[cd, "./tools"]
]
timelimit : "30:00"
}
toolsGateLite : ${toolsCommon} {
run : [
["mx", "build" ],
["mx", "unittest", "--verbose" ]
["mx", "sigtest" ]
]
}
toolsCoverageWhitelisting: [
"--jacoco-whitelist-package",
"org.graalvm.tools",
"--jacoco-whitelist-package",
"com.oracle.truffle.tools"
]
toolsCoverageWeekly: {
"run": [
[
"mx"
] ${toolsCoverageWhitelisting} [
"--strict-compliance",
"gate",
"--strict-mode",
"--jacoco-omit-excluded",
"--jacocout",
"html"
],
["mx"] ${toolsCoverageWhitelisting} ["coverage-upload"]
],
targets: ["weekly"]
}
toolsWeekly: ${tools-weekly-notifications} {
targets: ["weekly"]
}
builds += [
${linux-amd64} ${oraclejdk8} ${toolsCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-tools-8"},
${linux-amd64} ${oraclejdk11} ${toolsCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-tools-oraclejdk-11"},
${linux-amd64} ${oraclejdk17} ${toolsCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-tools-oraclejdk-17"},
${linux-amd64} ${oraclejdk8} ${toolsCommon} {
run : [
["mx", "build"],
["mx", "javadoc"],
],
targets : [gate],
name: "gate-tools-javadoc"
},
${windows-amd64} ${oraclejdk8} ${toolsGateLite} ${devkits.windows-oraclejdk8} {
targets : [gate],
name: "gate-tools-windows-8"
},
${darwin-amd64} ${oraclejdk8} ${toolsGateLite} ${toolsWeekly} {
name: "gate-tools-mac-lite-8"
},
${darwin-amd64} ${oraclejdk11} ${toolsGateLite} ${toolsWeekly} {
name: "gate-tools-mac-lite-oraclejdk-11"
}
${darwin-amd64} ${oraclejdk17} ${toolsGateLite} ${toolsWeekly} {
name: "gate-tools-mac-lite-oraclejdk-17"
}
${linux-aarch64} ${labsjdk11} ${toolsGateLite} ${toolsWeekly} {
name: "gate-tools-linux-aarch64-lite-labsjdk-11"
},
${linux-amd64} ${oraclejdk8} ${toolsCommon} ${eclipse} ${jdt} ${toolsCoverageWeekly} {
name: "weekly-tools-coverage"
}
]

82
tools/ci.jsonnet Normal file
View File

@ -0,0 +1,82 @@
{
local common = import '../common.jsonnet',
local devkits = (import "../common.json").devkits,
local tools_common = {
setup+: [
["cd", "./tools"],
],
timelimit: "30:00",
},
local tools_gate = tools_common + common["linux-amd64"] + common.eclipse + common.jdt + {
name: 'gate-tools-oraclejdk' + self.jdk_version + '-' + self.os + '-' + self.arch,
run: [["mx", "--strict-compliance", "gate", "--strict-mode"]],
targets: ["gate"],
},
local tools_gate_lite = tools_common + {
name: 'gate-tools-lite-oraclejdk' + self.jdk_version + '-' + self.os + '-' + self.arch,
run: [
["mx", "build"],
["mx", "unittest", "--verbose"],
["mx", "sigtest"],
],
notify_groups:: ["tools"],
targets: ["weekly"],
},
local coverage_whitelisting = [
"--jacoco-whitelist-package",
"org.graalvm.tools",
"--jacoco-whitelist-package",
"com.oracle.truffle.tools"
],
builds: [
common.oraclejdk8 + tools_gate,
common.oraclejdk11 + tools_gate,
common.oraclejdk17 + tools_gate,
common["linux-amd64"] + common.oraclejdk8 + tools_common + {
name: "gate-tools-javadoc",
run: [
["mx", "build"],
["mx", "javadoc"],
],
targets: ["gate"],
},
common["windows-amd64"] + common.oraclejdk8 + devkits["windows-oraclejdk8"] + tools_gate_lite + {
packages+: {
"mx": "HEAD",
"pip:isort": "==4.3.19",
"pip:logilab-common": "==1.4.4",
"pip:ninja_syntax": "==1.7.2",
"pip:pylint": "==1.9.3",
},
},
common["darwin-amd64"] + common.oraclejdk8 + tools_gate_lite,
common["darwin-amd64"] + common.oraclejdk11 + tools_gate_lite,
common["darwin-amd64"] + common.oraclejdk17 + tools_gate_lite,
common["linux-aarch64"] + common.labsjdk11 + tools_gate_lite,
common["linux-amd64"] + common.oraclejdk8 + tools_common + common.eclipse + common.jdt + {
name: "weekly-tools-coverage",
run: [
["mx"] + coverage_whitelisting + [
"--strict-compliance",
"gate",
"--strict-mode",
"--jacoco-omit-excluded",
"--jacocout",
"html",
],
["mx"] + coverage_whitelisting + ["coverage-upload"],
],
targets: ["weekly"],
}
],
}