Skip to content

Commit 558b576

Browse files
woesswoess
committed
[GR-48852] [GR-49748] Set diskspace_required and run gate on jdk-latest by default.
PullRequest: js/2965
2 parents 0caaded + 8ca0a52 commit 558b576

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

‎ci.jsonnet‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ local graalNodeJs = import 'graal-nodejs/ci.jsonnet';
5757
+ self.graalvmtests_run
5858
+ (if std.length(self.cd_run) > 0 then [['mx', 'sversions']] else []),
5959
timelimit: error "timelimit not set for '" + (if std.objectHasAll(self, 'name') then self.name else '') + "'",
60+
diskspace_required: '30GB',
6061
},
6162

6263
defs:: {
@@ -99,7 +100,7 @@ local graalNodeJs = import 'graal-nodejs/ci.jsonnet';
99100
common.jdklatest + common.darwin_aarch64,
100101
common.jdklatest + common.windows_amd64,
101102
],
102-
mainGatePlatform:: common.jdk21 + common.linux_amd64,
103+
mainGatePlatform:: common.jdklatest + common.linux_amd64,
103104
styleGatePlatforms:: [
104105
common.jdk21 + common.linux_amd64,
105106
common.jdklatest + common.linux_amd64,

‎graal-js/ci.jsonnet‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,10 @@ local ci = import '../ci.jsonnet';
128128
// Builds that should run on all supported platforms
129129
local testingBuilds = generateBuilds([
130130
graalJs + gateTags('default') + ce + {name: 'default-ce'} +
131-
promoteToTarget(common.gate, [common.jdk21 + common.linux_amd64, common.jdk21 + common.linux_aarch64, common.jdk21 + common.windows_amd64]),
131+
promoteToTarget(common.gate, [common.jdklatest + common.linux_amd64, common.jdklatest + common.linux_aarch64, common.jdklatest + common.windows_amd64]),
132132
graalJs + gateTags('default') + ee + {name: 'default-ee'} +
133-
promoteToTarget(common.gate, [common.jdk21 + common.linux_amd64, common.jdk21 + common.darwin_aarch64]) +
134-
promoteToTarget(common.postMerge, [common.jdk21 + common.darwin_amd64]),
133+
promoteToTarget(common.gate, [common.jdklatest + common.linux_amd64, common.jdklatest + common.darwin_aarch64]) +
134+
promoteToTarget(common.postMerge, [common.jdklatest + common.darwin_amd64]),
135135

136136
graalJs + gateTags('noic') + {name: 'noic'} + gateOnMain,
137137
graalJs + gateTags('directbytebuffer') + {name: 'directbytebuffer'} + gateOnMain,
@@ -170,7 +170,7 @@ local ci = import '../ci.jsonnet';
170170
# Note: weekly coverage is sync'ed with the graal repo (while ondemand is not).
171171
graalJs + common.weekly + gateCoverage + {name: 'coverage'},
172172
graalJs + common.ondemand + gateCoverage + {name: 'coverage'},
173-
], platforms=[ci.mainGatePlatform]),
173+
], platforms=[common.jdk21 + common.linux_amd64]),
174174

175175
// Benchmark builds; need to run on a benchmark machine
176176
local benchBuilds = generateBuilds([

‎graal-nodejs/ci.jsonnet‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,13 @@ local cicommon = import '../ci/common.jsonnet';
151151
// Builds that should run on all supported platforms
152152
local testingBuilds = generateBuilds([
153153
graalNodeJs + build + defaultGateTags + {dynamicimports+:: ['/wasm']} + {name: 'default'} +
154-
promoteToTarget(common.gate, [common.jdk21 + common.linux_amd64, common.jdk21 + common.linux_aarch64, common.jdk21 + common.darwin_aarch64, common.jdk21 + common.windows_amd64]) +
155-
promoteToTarget(common.postMerge, [common.jdk21 + common.darwin_amd64]),
154+
promoteToTarget(common.gate, [common.jdklatest + common.linux_amd64, common.jdklatest + common.linux_aarch64, common.jdklatest + common.darwin_aarch64, common.jdklatest + common.windows_amd64]) +
155+
promoteToTarget(common.postMerge, [common.jdklatest + common.darwin_amd64]),
156156

157157
graalNodeJs + vm_env + build + gateVmSmokeTest + ce + {name: 'graalvm-ce'} +
158158
promoteToTarget(common.gate, [ci.mainGatePlatform]) +
159-
promoteToTarget(common.gate, [common.jdk21 + common.darwin_aarch64, common.jdk21 + common.windows_amd64]) +
160-
promoteToTarget(common.postMerge, [common.jdk21 + common.darwin_amd64]),
159+
promoteToTarget(common.gate, [common.jdklatest + common.darwin_aarch64, common.jdklatest + common.windows_amd64]) +
160+
promoteToTarget(common.postMerge, [common.jdklatest + common.darwin_amd64]),
161161
graalNodeJs + vm_env + build + gateVmSmokeTest + ee + {name: 'graalvm-ee'} +
162162
promoteToTarget(common.gate, [ci.mainGatePlatform]),
163163

@@ -170,7 +170,7 @@ local cicommon = import '../ci/common.jsonnet';
170170
graalNodeJs + buildNodeAPI + testNode('node-api', max_heap='4G') + maxHeapOnWindows('512M') + {name: 'node-api'},
171171
graalNodeJs + buildJSNativeAPI + testNode('js-native-api', max_heap='4G') + maxHeapOnWindows('512M') + {name: 'js-native-api'},
172172
]] +
173-
[gateOnMain + promoteToTarget(common.gate, [common.jdk21 + common.windows_amd64]) + b for b in [
173+
[gateOnMain + promoteToTarget(common.gate, [common.jdklatest + common.windows_amd64]) + b for b in [
174174
graalNodeJs + vm_env + build + testNode('async-hooks', max_heap='4G') + maxHeapOnWindows('512M') + {name: 'async-hooks'},
175175
graalNodeJs + vm_env + build + testNode('es-module', max_heap='4G') + maxHeapOnWindows('512M') + {name: 'es-module'},
176176
# We run the `sequential` tests with a smaller heap because `test/sequential/test-child-process-pass-fd.js` starts 80 child processes.
@@ -195,7 +195,7 @@ local cicommon = import '../ci/common.jsonnet';
195195
graalNodeJs + common.weekly + gateCoverage + {name: 'coverage'},
196196
graalNodeJs + common.ondemand + gateCoverage + {name: 'coverage'},
197197

198-
], platforms=[ci.mainGatePlatform]),
198+
], platforms=[common.jdk21 + common.linux_amd64]),
199199

200200
builds: styleBuilds + testingBuilds + otherBuilds,
201201
}

0 commit comments

Comments
 (0)