Skip to content

Commit 94bfd03

Browse files
committed
Assign Truffle jobs to a tier.
1 parent 55887f9 commit 94bfd03

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

tools/ci/ci.jsonnet

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
}
2323
},
2424

25-
local tools_post_merge = gate_guard + tools_common + common.deps.eclipse + common.deps.jdt + common.deps.spotbugs + {
26-
name: 'post-merge-tools-oracle' + self.jdk_name + '-' + self.os + '-' + self.arch,
25+
local tools_gate = gate_guard + tools_common + common.deps.eclipse + common.deps.jdt + common.deps.spotbugs + {
26+
name: 'gate-tools-oracle' + self.jdk_name + '-' + self.os + '-' + self.arch,
2727
run: [["mx", "--strict-compliance", "gate", "--strict-mode"]],
28-
targets: ["post-merge"],
28+
targets: [if (self.jdk_name == "jdk-latest") then "tier2" else "tier3"],
2929
guard+: {
3030
includes+: ["**.jsonnet"],
3131
},
@@ -44,12 +44,12 @@
4444
},
4545

4646
local tools_javadoc = tools_common + common_guard + {
47-
name: "post-merge-tools-javadoc-" + self.jdk_name,
47+
name: "gate-tools-javadoc-" + self.jdk_name,
4848
run: [
4949
["mx", "build"],
5050
["mx", "javadoc"],
5151
],
52-
targets: ["post-merge"],
52+
targets: ["tier1"],
5353
notify_groups:: ["tools"],
5454
},
5555

@@ -84,8 +84,8 @@
8484
},
8585

8686
local _builds = [
87-
common.linux_amd64 + common.oraclejdkLatest + tools_post_merge,
88-
common.linux_amd64 + common.oraclejdk21 + tools_post_merge,
87+
common.linux_amd64 + common.oraclejdkLatest + tools_gate,
88+
common.linux_amd64 + common.oraclejdk21 + tools_gate,
8989

9090
common.linux_amd64 + common.oraclejdkLatest + tools_javadoc,
9191
common.linux_amd64 + common.oraclejdk21 + tools_coverage_weekly,

vm/ci/ci_includes/vm-native.jsonnet

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
1111
notify_groups: ["truffle"],
1212
components+: ["truffletck"],
1313
timelimit: '35:00',
14-
name: self.targets[0] + '-vm-truffle-native-tck-labs' + self.jdk_name + '-linux-amd64',
14+
name: 'gate-vm-truffle-native-tck-labs' + self.jdk_name + '-linux-amd64',
1515
logs+: [
1616
"*/call_tree.txt.gz"
1717
]
@@ -24,7 +24,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
2424
notify_groups: ["wasm"],
2525
components+: ["truffletck"],
2626
timelimit: '35:00',
27-
name: self.targets[0] + '-vm-truffle-native-tck-wasm-labs' + self.jdk_name + '-linux-amd64',
27+
name: 'gate-vm-truffle-native-tck-wasm-labs' + self.jdk_name + '-linux-amd64',
2828
},
2929

3030
local truffle_maven_downloader = graal_common.deps.svm + graal_common.deps.sulong + {
@@ -37,21 +37,21 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
3737
packages+: {
3838
maven: '==3.5.3',
3939
},
40-
name: self.targets[0] + '-vm-ce-truffle-maven-downloader-labs' + self.jdk_name + '-linux-amd64',
40+
name: 'gate-vm-ce-truffle-maven-downloader-labs' + self.jdk_name + '-linux-amd64',
4141
},
4242

4343
local builds = [
44-
vm.vm_java_Latest + graal_common.deps.svm + graal_common.deps.sulong + graal_common.deps.graalpy + vm.custom_vm + vm_common.vm_base('linux', 'amd64', 'post-merge') + {
44+
vm.vm_java_Latest + graal_common.deps.svm + graal_common.deps.sulong + graal_common.deps.graalpy + vm.custom_vm + vm_common.vm_base('linux', 'amd64', 'tier3') + {
4545
run+: [
4646
['mx', '--env', vm.edition, '--native-images=true', '--dy', 'graalpython', 'gate', '-B--targets=GRAALPY_NATIVE_STANDALONE', '--no-warning-as-error', '--tags', 'build,python'],
4747
],
4848
notify_groups: ["python"],
4949
timelimit: '45:00',
50-
name: 'post-merge-vm-native-graalpython-linux-amd64',
50+
name: 'gate-vm-native-graalpython-linux-amd64',
5151
},
52-
vm.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'post-merge') + truffle_native_tck,
53-
vm.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'post-merge') + truffle_native_tck_wasm,
54-
vm.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'post-merge') + truffle_maven_downloader,
52+
vm.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'tier3') + truffle_native_tck,
53+
vm.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'tier3') + truffle_native_tck_wasm,
54+
vm.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'tier3') + truffle_maven_downloader,
5555
],
5656

5757
builds: utils.add_defined_in(builds, std.thisFile),

0 commit comments

Comments
 (0)