Skip to content

Commit bf17700

Browse files
ansalondansalond
committed
[GR-35948] Translate CI files in the vm suite from hocon to jsonnet.
PullRequest: graal/10730
2 parents b763b41 + 9a6db83 commit bf17700

18 files changed

+1168
-1074
lines changed

‎ci-resources.libsonnet

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
ol8_bench_image: "<ol8_bench_image>",
55
benchmarking_config_repo: "<benchmarking_config_repo>",
66

7-
notify_nexus_deploy: "<notify_nexus_deploy>",
8-
notify_releaser_service: "<notify_releaser_service>"
7+
notify_nexus_deploy: ["<notify_nexus_deploy>"],
8+
notify_releaser_service: ["<notify_releaser_service>"]
99
}
1010
}

‎ci.hocon

-8
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ labsjdk17: ${labsjdk-ce-17}
44

55
builds = []
66

7-
binaries-repository = "lafo"
8-
97
#Compiler
108
compiler-suite-root = "./compiler"
119
logPatterns = [
@@ -23,9 +21,3 @@ include "compiler/ci_common/bench.hocon"
2321
# ------------------ SVM ----------------------
2422
include "substratevm/ci_includes/gate.hocon"
2523

26-
# ------------------- VM ----------------------
27-
include "vm/ci_common/common.hocon"
28-
include "vm/ci_common/common-bench.hocon"
29-
include "vm/ci_includes/vm.hocon"
30-
include "vm/ci_includes/vm-native.hocon"
31-
include "vm/ci_includes/vm-bench.hocon"

‎ci.jsonnet

+5-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ local truffle = import 'truffle/ci.jsonnet';
2525
# JavaDoc
2626
local javadoc = import "ci_includes/publish-javadoc.jsonnet";
2727

28+
# VM
29+
local vm = import 'vm/ci_includes/vm.jsonnet';
30+
2831
# Add a guard to `build` that prevents it from running in the gate
2932
# for a PR that only touches *.md files, the docs, are config files for GitHub.
3033
local add_excludes_guard(build) = build + {
@@ -47,6 +50,7 @@ local add_excludes_guard(build) = build + {
4750
sulong.builds +
4851
tools.builds +
4952
truffle.builds +
50-
javadoc.builds
53+
javadoc.builds +
54+
vm.builds
5155
)]
5256
}

‎common.hocon

+8-33
Original file line numberDiff line numberDiff line change
@@ -97,38 +97,13 @@ darwin-deploy : ${darwin} ${maven-download-unix} {
9797
}
9898
}
9999

100-
svm-common: ${mx} {
101-
environment: {
102-
DEFAULT_VM: "server"
103-
LANG: "en_US.UTF-8"
104-
}
105-
logs: [
106-
"../.native-image/*/*/*/*.log"
107-
"../*/*/*.log"
108-
"*/*.log"
109-
"*/svmbuild/*.log"
110-
"*/svmbuild/images/*.log"
111-
"*/*/stripped/*.map"
112-
"*/callgrind.*"
113-
"*.bgv"
114-
"*.log"
115-
]
116-
}
100+
svm-common: ${mx} ${svm.deps.common}
117101

118-
svm-common-linux-amd64: ${svm-common} ${linux-amd64} {
119-
packages: {
120-
devtoolset: "==7" # GCC 7.3.1, make 4.2.1, binutils 2.28, valgrind 3.13.0
121-
binutils: ">=2.34"
122-
ruby: ">=2.1.0"
123-
}
102+
svm-common-linux-amd64: ${svm-common} ${svm.deps.linux_amd64} ${linux-amd64} {
124103
timelimit: "55:00"
125104
}
126105

127-
svm-common-linux-aarch64: ${svm-common} ${linux-aarch64} {
128-
packages: {
129-
devtoolset: "==7" # GCC 7.3.1, make 4.2.1, binutils 2.28, valgrind 3.13.0
130-
ruby: ">=2.1.0"
131-
}
106+
svm-common-linux-aarch64: ${svm-common} ${svm.deps.linux_aarch64} ${linux-aarch64} {
132107
timelimit: "55:00"
133108
}
134109

@@ -146,27 +121,27 @@ svm-capabilities-manycores : {
146121
capabilities : ${svm-capabilities} [manycores]
147122
}
148123

149-
svm-common-darwin: ${svm-common} ${darwin-amd64} {
124+
svm-common-darwin: ${svm-common} ${svm.deps.darwin} ${darwin-amd64} {
150125
timelimit: "45:00"
151126
}
152127

153-
svm-common-windows-openjdk8: ${svm-common} ${windows-amd64} ${devkits.windows-openjdk8} {
128+
svm-common-windows-openjdk8: ${svm-common} ${svm.deps.windows} ${windows-amd64} ${devkits.windows-openjdk8} {
154129
packages : {
155130
}
156131
timelimit: "45:00"
157132
}
158133

159-
svm-common-windows-oraclejdk8: ${svm-common} ${windows-amd64} ${devkits.windows-oraclejdk8} {
134+
svm-common-windows-oraclejdk8: ${svm-common} ${svm.deps.windows} ${windows-amd64} ${devkits.windows-oraclejdk8} {
160135
packages : {
161136
}
162137
timelimit: "45:00"
163138
}
164139

165-
svm-common-windows-jdk11: ${svm-common} ${windows-amd64} ${devkits.windows-jdk11} {
140+
svm-common-windows-jdk11: ${svm-common} ${svm.deps.windows} ${windows-amd64} ${devkits.windows-jdk11} {
166141
timelimit: "45:00"
167142
}
168143

169-
svm-common-windows-jdk17: ${svm-common} ${windows-amd64} ${devkits.windows-jdk17} {
144+
svm-common-windows-jdk17: ${svm-common} ${svm.deps.windows} ${windows-amd64} ${devkits.windows-jdk17} {
170145
timelimit: "45:00"
171146
}
172147

‎common.json

+36
Original file line numberDiff line numberDiff line change
@@ -138,5 +138,41 @@
138138
},
139139
"darwin": {}
140140
}
141+
},
142+
"svm": {
143+
"deps": {
144+
"COMMENT.common": "graal/vm/ci_common/common.jsonnet hardcodes the properties of this object",
145+
"common": {
146+
"environment": {
147+
"DEFAULT_VM": "server",
148+
"LANG": "en_US.UTF-8"
149+
},
150+
"logs": [
151+
"../.native-image/*/*/*/*.log",
152+
"../*/*/*.log",
153+
"*/*.log",
154+
"*/svmbuild/*.log",
155+
"*/svmbuild/images/*.log",
156+
"*/*/stripped/*.map",
157+
"*/callgrind.*",
158+
"*.log"
159+
]
160+
},
161+
"linux_amd64": {
162+
"packages": {
163+
"devtoolset": "==7",
164+
"binutils": ">=2.34",
165+
"ruby": ">=2.1.0"
166+
}
167+
},
168+
"linux_aarch64": {
169+
"packages": {
170+
"devtoolset": "==7",
171+
"ruby": ">=2.1.0"
172+
}
173+
},
174+
"darwin": {},
175+
"windows": {}
176+
}
141177
}
142178
}

‎common.jsonnet

+7-5
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
arch:: error "self.arch not set" + where,
115115
capabilities +: [],
116116
catch_files +: common_json.catch_files,
117-
logs : [
117+
logs +: [
118118
"*.bgv",
119119
"./" + repo_config.compiler.compiler_suite + "/graal_dumps/*/*",
120120
"*/es-*.json"
@@ -124,12 +124,14 @@
124124
linux:: deps.linux + self.common + {os::"linux", capabilities+: [self.os]},
125125
darwin:: deps.darwin + self.common + {os::"darwin", capabilities+: [self.os]},
126126
windows:: deps.windows + self.common + {os::"windows", capabilities+: [self.os]},
127+
windows_server_2016:: self.windows + {capabilities+: ["windows_server_2016"]},
127128

128129
amd64:: { arch::"amd64", capabilities+: [self.arch]},
129130
aarch64:: { arch::"aarch64", capabilities+: [self.arch]},
130131

131-
linux_amd64:: self.linux + self.amd64,
132-
darwin_amd64:: self.darwin + self.amd64,
133-
windows_amd64:: self.windows + self.amd64,
134-
linux_aarch64:: self.linux + self.aarch64,
132+
linux_amd64:: self.linux + self.amd64,
133+
darwin_amd64:: self.darwin + self.amd64,
134+
windows_amd64:: self.windows + self.amd64,
135+
windows_server_2016_amd64:: self.windows_server_2016 + self.amd64,
136+
linux_aarch64:: self.linux + self.aarch64,
135137
}

‎graal-common.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"README": "This file contains definitions that are useful for the hocon and jsonnet CI files of the graal and graal-enterprise repositories.",
33
"ci": {
4-
"overlay": "019447219c1cfc082aca7e2ae9cdd7042403c037"
4+
"overlay": "248c5450a7a6636f310cfb370d88957234b593a6"
55
},
66

77
"COMMENT.mx": [

‎truffle/ci.jsonnet

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161

162162
# BENCHMARKS
163163

164-
bench_hw.x52 + linux_amd64 + common.oraclejdk11 + bench_common + {
164+
bench_hw.x52 + common.oraclejdk11 + bench_common + {
165165
name: "bench-truffle-jmh",
166166
notify_groups:: ["truffle_bench"],
167167
run: [

‎vm/ci_common/common-bench.hocon

-168
This file was deleted.

0 commit comments

Comments
 (0)