Skip to content

Commit 8931ba3

Browse files
ansalondansalond
committed
[GR-68727] Move the last graal gates to a tier or to post-merge.
PullRequest: graal/21864
2 parents bad317d + 94bfd03 commit 8931ba3

File tree

5 files changed

+18
-48
lines changed

5 files changed

+18
-48
lines changed

‎graal-common.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"README": "This file contains definitions that are useful for the jsonnet CI files of the graal and graal-enterprise repositories.",
33
"ci": {
4-
"overlay": "a661d2fe42f118faf07caa881ced6566201e068c"
4+
"overlay": "2f0084a8ab476f991f50132e1879a925efb0d596"
55
}
66
}

‎tools/ci/ci.jsonnet‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@
2525
local tools_gate = gate_guard + tools_common + common.deps.eclipse + common.deps.jdt + common.deps.spotbugs + {
2626
name: 'gate-tools-oracle' + self.jdk_name + '-' + self.os + '-' + self.arch,
2727
run: [["mx", "--strict-compliance", "gate", "--strict-mode"]],
28-
targets: ["gate"],
28+
targets: [if (self.jdk_name == "jdk-latest") then "tier2" else "tier3"],
2929
guard+: {
3030
includes+: ["**.jsonnet"],
31-
}
31+
},
32+
notify_groups:: ["tools"],
3233
},
3334

3435
local tools_weekly = tools_common + {
@@ -48,7 +49,8 @@
4849
["mx", "build"],
4950
["mx", "javadoc"],
5051
],
51-
targets: ["gate"]
52+
targets: ["tier1"],
53+
notify_groups:: ["tools"],
5254
},
5355

5456
local coverage_whitelisting = [

‎vm/ci/ci_common/common.jsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ local devkits = graal_common.devkits;
577577
#
578578
# Gates
579579
#
580-
vm.vm_java_Latest + graal_common.deps.eclipse + graal_common.deps.jdt + graal_common.deps.spotbugs + self.vm_base('linux', 'amd64', 'gate') + galahad.exclude + {
580+
vm.vm_java_Latest + graal_common.deps.eclipse + graal_common.deps.jdt + graal_common.deps.spotbugs + self.vm_base('linux', 'amd64', 'tier1') + galahad.exclude + {
581581
run: [
582582
['mx', 'gate', '-B=--force-deprecation-as-warning', '--tags', 'style,fullbuild'],
583583
],

‎vm/ci/ci_includes/vm-native.jsonnet‎

Lines changed: 8 additions & 7 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,20 +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', 'gate') + {
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
],
48+
notify_groups: ["python"],
4849
timelimit: '45:00',
4950
name: 'gate-vm-native-graalpython-linux-amd64',
5051
},
51-
vm.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'gate') + truffle_native_tck,
52-
vm.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'gate') + truffle_native_tck_wasm,
53-
vm.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'gate') + 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,
5455
],
5556

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

‎vm/ci/ci_includes/vm.jsonnet‎

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -86,23 +86,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
8686
},
8787

8888
local builds = [
89-
utils.add_gate_predicate(self.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'gate') + {
90-
run: [
91-
['mx', 'build'],
92-
['mx', 'unittest', '--suite', 'vm'],
93-
],
94-
name: 'gate-vm-unittest-linux-amd64',
95-
timelimit: '30:00',
96-
}, ['sdk', 'truffle', 'vm']),
97-
utils.add_gate_predicate(self.vm_java_Latest + graal_common.devkits['windows-jdkLatest'] + vm_common.vm_base('windows', 'amd64', 'gate') + {
98-
run: [
99-
['mx', 'build'],
100-
['mx', 'unittest', '--suite', 'vm'],
101-
],
102-
name: 'gate-vm-unittest-windows-amd64',
103-
timelimit: '30:00',
104-
}, ["sdk", "truffle", "vm"]),
105-
self.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'gate') + graal_common.deps.sulong + {
89+
self.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'post-merge') + graal_common.deps.sulong + {
10690
environment+: {
10791
DYNAMIC_IMPORTS: '/tools,/substratevm,/sulong',
10892
NATIVE_IMAGES: 'polyglot',
@@ -111,55 +95,38 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
11195
['rm', '-rf', '../.git'],
11296
['mx', 'gate', '--strict-mode', '--tags', 'build'],
11397
],
114-
name: 'gate-vm-build-without-vcs-linux-amd64',
98+
name: 'post-merge-vm-build-without-vcs-linux-amd64',
11599
timelimit: '30:00',
100+
notify_groups:: ['deploy'],
116101
},
117102

118103
# Linux/AMD64
119-
vm_common.graalvm_complete_build_deps('ce', 'linux', 'amd64', java_version='latest') + vm_common.linux_deploy + vm_common.vm_base('linux', 'amd64', 'gate') + vm_common.maven_deploy_base_functions.base_object('linux', 'amd64', dry_run=true, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local', other_platforms=['linux-aarch64', 'darwin-aarch64', 'windows-amd64']) + {
120-
name: 'gate-vm-maven-dry-run-linux-amd64',
121-
timelimit: '1:00:00',
122-
},
123104
vm_common.graalvm_complete_build_deps('ce', 'linux', 'amd64', java_version='latest') + vm_common.linux_deploy + vm_common.vm_base('linux', 'amd64', 'daily', deploy=true) + vm_common.maven_deploy_base_functions.base_object('linux', 'amd64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + {
124105
name: 'daily-deploy-vm-maven-linux-amd64',
125106
timelimit: '1:00:00',
126107
notify_groups:: ['deploy'],
127108
},
128109
# Linux/AARCH64
129-
vm_common.graalvm_complete_build_deps('ce', 'linux', 'aarch64', java_version='latest') + vm_common.linux_deploy + vm_common.vm_base('linux', 'aarch64', 'gate') + vm_common.maven_deploy_base_functions.base_object('linux', 'aarch64', dry_run=true, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + {
130-
name: 'gate-vm-maven-dry-run-linux-aarch64',
131-
timelimit: '1:00:00',
132-
},
133110
vm_common.graalvm_complete_build_deps('ce', 'linux', 'aarch64', java_version='latest') + vm_common.linux_deploy + vm_common.vm_base('linux', 'aarch64', 'daily', deploy=true) + vm_common.maven_deploy_base_functions.base_object('linux', 'aarch64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + {
134111
name: 'daily-deploy-vm-maven-linux-aarch64',
135112
timelimit: '1:00:00',
136113
notify_groups:: ['deploy'],
137114
},
138115
# Darwin/AMD64
139-
# We do not have a gate that executes a dry-run of Maven deployment for darwin/amd64. We just rely on the daily job defined below.
140116
vm_common.graalvm_complete_build_deps('ce', 'darwin', 'amd64', java_version='latest') + vm_common.darwin_deploy + vm_common.vm_base('darwin', 'amd64', 'daily', deploy=true, jdk_hint='Latest') + vm_common.maven_deploy_base_functions.base_object('darwin', 'amd64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + {
141117
name: 'daily-deploy-vm-maven-darwin-amd64',
142118
capabilities+: ['darwin_bigsur'],
143119
timelimit: '1:00:00',
144120
notify_groups:: ['deploy'],
145121
},
146122
# Darwin/AARCH64
147-
vm_common.graalvm_complete_build_deps('ce', 'darwin', 'aarch64', java_version='latest') + vm_common.darwin_deploy + vm_common.vm_base('darwin', 'aarch64', 'gate') + vm_common.maven_deploy_base_functions.base_object('darwin', 'aarch64', dry_run=true, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + {
148-
name: 'gate-vm-maven-dry-run-darwin-aarch64',
149-
capabilities+: ['darwin_bigsur'],
150-
timelimit: '1:00:00',
151-
},
152123
vm_common.graalvm_complete_build_deps('ce', 'darwin', 'aarch64', java_version='latest') + vm_common.darwin_deploy + vm_common.vm_base('darwin', 'aarch64', 'daily', deploy=true) + vm_common.maven_deploy_base_functions.base_object('darwin', 'aarch64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + {
153124
name: 'daily-deploy-vm-maven-darwin-aarch64',
154125
capabilities+: ['darwin_bigsur'],
155126
timelimit: '1:00:00',
156127
notify_groups:: ['deploy'],
157128
},
158129
# Windows/AMD64
159-
vm_common.graalvm_complete_build_deps('ce', 'windows', 'amd64', java_version='latest') + vm_common.deploy_build + vm_common.vm_base('windows', 'amd64', 'gate') + vm_common.maven_deploy_base_functions.base_object('windows', 'amd64', dry_run=true, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + {
160-
name: 'gate-vm-maven-dry-run-windows-amd64',
161-
timelimit: '1:00:00',
162-
},
163130
vm_common.graalvm_complete_build_deps('ce', 'windows', 'amd64', java_version='latest') + vm_common.deploy_build + vm_common.vm_base('windows', 'amd64', 'daily', deploy=true, jdk_hint='Latest') + vm_common.maven_deploy_base_functions.base_object('windows', 'amd64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + {
164131
name: 'daily-deploy-vm-maven-windows-amd64',
165132
timelimit: '1:00:00',

0 commit comments

Comments
 (0)