Skip to content

Commit 328b04c

Browse files
OracleLabsAutomationOracleLabsAutomation
committed
Automatic merge of master into galahad
2 parents d31bb17 + 6383299 commit 328b04c

File tree

7 files changed

+34
-23
lines changed

7 files changed

+34
-23
lines changed

‎compiler/ci/ci_common/gate.jsonnet‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -226,28 +226,28 @@
226226
local tier1_jobs = {
227227
# Style jobs need to stay on a JDK compatible with all the style
228228
# checking tools (SpotBugs, Checkstyle, Eclipse formatter etc).
229-
"compiler-style-labsjdk-latest-linux-amd64": {},
229+
"compiler-style-labsjdk-latest-linux-amd64": t("30:00"),
230230
},
231231

232232
# Candidates for Tier2 jobs. In CE, these will be dailies.
233233
local tier2_jobs = {
234-
"compiler-unittest_compiler-labsjdk-latest-linux-amd64": {},
235-
"compiler-unittest_truffle-labsjdk-latest-linux-amd64": {},
236-
"compiler-ctw-labsjdk-latest-linux-amd64": {},
237-
"compiler-ctw_economy-labsjdk-latest-linux-amd64": {},
238-
"compiler-benchmarktest-labsjdk-latest-linux-amd64": {},
234+
"compiler-unittest_compiler-labsjdk-latest-linux-amd64": t("30:00"),
235+
"compiler-unittest_truffle-labsjdk-latest-linux-amd64": t("30:00"),
236+
"compiler-ctw-labsjdk-latest-linux-amd64": t("30:00"),
237+
"compiler-ctw_economy-labsjdk-latest-linux-amd64": t("30:00"),
238+
"compiler-benchmarktest-labsjdk-latest-linux-amd64": t("30:00"),
239239
},
240240

241241
# Candidates for Tier3 jobs. In CE, these will be dailies.
242242
local tier3_jobs = {
243-
"compiler-unittest_compiler-labsjdk-latest-darwin-aarch64": {},
244-
"compiler-unittest_truffle-labsjdk-latest-darwin-aarch64": {},
245-
"compiler-unittest_compiler-labsjdk-latest-linux-aarch64": {},
246-
"compiler-unittest_truffle-labsjdk-latest-linux-aarch64": {},
243+
"compiler-unittest_compiler-labsjdk-latest-darwin-aarch64": t("45:00"),
244+
"compiler-unittest_truffle-labsjdk-latest-darwin-aarch64": t("45:00"),
245+
"compiler-unittest_compiler-labsjdk-latest-linux-aarch64": t("45:00"),
246+
"compiler-unittest_truffle-labsjdk-latest-linux-aarch64": t("45:00"),
247247

248-
"compiler-unittest_compiler_zgc-labsjdk-latest-linux-amd64": {},
248+
"compiler-unittest_compiler_zgc-labsjdk-latest-linux-amd64": t("45:00"),
249249

250-
"compiler-truffle_xcomp-labsjdk-latest-linux-amd64": {},
250+
"compiler-truffle_xcomp-labsjdk-latest-linux-amd64": t("45:00"),
251251
},
252252

253253
# Candidates for gate jobs. In CE, these will be dailies instead of gates.

‎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": "3e032b0adc64c05bbd0aef1c116f4e69796aee9e",
4+
"overlay": "a661d2fe42f118faf07caa881ced6566201e068c"
55
}
66
}

‎sdk/ci/ci.jsonnet‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22
local common = import '../../ci/ci_common/common.jsonnet',
33
local utils = import '../../ci/ci_common/common-utils.libsonnet',
44

5+
local normalize_target_with_dash(t) = if std.startsWith(t, "post-merge") then "" # no prefix for 'post-merge'
6+
else if std.startsWith(t, "tier") then "gate-" # keep 'gate' prefix for now, and add dash
7+
else t + '-', # default for everything else, including dash
8+
59
local sdk_gate(target) = common.deps.spotbugs {
6-
name: target + '-sdk-oracle' + self.jdk_name + '-' + self.os + '-' + self.arch,
10+
name: normalize_target_with_dash(target) + 'sdk-oracle' + self.jdk_name + '-' + self.os + '-' + self.arch,
711
setup: [
812
["cd", "./sdk"],
913
],
@@ -19,10 +23,10 @@
1923
},
2024

2125
local _builds = [
22-
common.linux_amd64 + common.oraclejdkLatest + sdk_gate("gate") + common.deps.eclipse + common.deps.jdt,
23-
common.linux_amd64 + common.oraclejdk21 + sdk_gate("gate") + common.deps.eclipse + common.deps.jdt,
24-
common.darwin_aarch64 + common.oraclejdkLatest + sdk_gate("gate"),
25-
common.darwin_aarch64 + common.oraclejdk21 + sdk_gate("gate"),
26+
common.linux_amd64 + common.oraclejdkLatest + sdk_gate("tier3") + common.deps.eclipse + common.deps.jdt,
27+
common.linux_amd64 + common.oraclejdk21 + sdk_gate("post-merge") + common.deps.eclipse + common.deps.jdt,
28+
common.darwin_aarch64 + common.oraclejdkLatest + sdk_gate("tier3"),
29+
common.darwin_aarch64 + common.oraclejdk21 + sdk_gate("post-merge"),
2630
common.darwin_amd64 + common.oraclejdkLatest + sdk_gate("daily"),
2731
common.darwin_amd64 + common.oraclejdk21 + sdk_gate("daily"),
2832
],

‎sulong/ci/ci.jsonnet‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,22 @@ local sc = (import "ci_common/sulong-common.jsonnet");
7070
},
7171

7272
regular_builds:: [
73-
$.sulong + tier1 + $.common(style=true) + sc.labsjdkLatest + sc.linux_amd64 + sc.style + { name: "gate-sulong-style-jdk-latest-linux-amd64" },
74-
$.sulong + tier1 + $.common(style=true) + sc.labsjdkLatest + sc.linux_amd64 + sc.fullbuild + { name: "gate-sulong-fullbuild-jdk-latest-linux-amd64" },
75-
$.sulong + tier2 + $.common(standalone=true) + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,sulongMisc,parser") + $.sulong_test_toolchain + { name: "gate-sulong-misc-parser-jdk-latest-linux-amd64" },
73+
$.sulong + tier1 + $.common(style=true) + sc.labsjdkLatest + sc.linux_amd64 + sc.style + { name: "gate-sulong-style-jdk-latest-linux-amd64", timelimit: "30:00" },
74+
$.sulong + tier1 + $.common(style=true) + sc.labsjdkLatest + sc.linux_amd64 + sc.fullbuild + { name: "gate-sulong-fullbuild-jdk-latest-linux-amd64", timelimit: "30:00" },
75+
$.sulong + tier2 + $.common(standalone=true) + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,sulongMisc,parser") + $.sulong_test_toolchain + { name: "gate-sulong-misc-parser-jdk-latest-linux-amd64", timelimit: "30:00" },
7676
$.sulong + tier2 + $.common() + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_c") + { name: "gate-sulong-gcc_c-jdk-latest-linux-amd64", timelimit: "45:00" },
7777
$.sulong + tier2 + $.common() + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_cpp") + { name: "gate-sulong-gcc_cpp-jdk-latest-linux-amd64", timelimit: "45:00" },
7878

7979
$.sulong + sc.daily + $.common() + sc.labsjdkLatest + sc.darwin_amd64 + sc.llvmBundled + sc.gateTags(basicTags) + { name: "daily-sulong-basic-nwcc-llvm-jdk-latest-darwin-amd64", timelimit: "0:45:00", capabilities+: ["ram16gb"] },
8080

81-
$.sulong + tier2 + $.common() + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags(basicTags) + { name: "gate-sulong-basic-nwcc-llvm-jdk-latest-linux-amd64" },
81+
$.sulong + tier2 + $.common() + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags(basicTags) + { name: "gate-sulong-basic-nwcc-llvm-jdk-latest-linux-amd64", timelimit: "30:00" },
8282

8383
$.sulong + tier3 + $.common() + sc.labsjdkLatest + sc.linux_aarch64 + sc.llvmBundled + sc.requireGMP + sc.gateTags(basicTagsNoNWCC) + { name: "gate-sulong-basic-llvm-jdk-latest-linux-aarch64", timelimit: "30:00" },
8484

8585
$.sulong + tier3 + $.common() + sc.labsjdkLatest + sc.darwin_aarch64 + sc.llvmBundled + sc.requireGMP + sc.gateTags(basicTagsNoNWCC) + { name: "gate-sulong-basic-llvm-jdk-latest-darwin-aarch64", timelimit: "30:00" },
8686

8787
$.sulong + sc.post_merge + $.common() + sc.labsjdkLatest + sc.windows_amd64 + sc.llvmBundled + sc.gateTags("build,sulongStandalone,interop") + { name: "gate-sulong-standalone-interop-jdk-latest-windows-amd64", timelimit: "1:00:00" },
88-
$.sulong + tier3 + $.common() + sc.labsjdkLatest + sc.windows_amd64 + sc.llvmBundled + sc.gateTags("build,nwcc,llvm") + { name: "gate-sulong-nwcc-llvm-jdk-latest-windows-amd64" },
88+
$.sulong + tier3 + $.common() + sc.labsjdkLatest + sc.windows_amd64 + sc.llvmBundled + sc.gateTags("build,nwcc,llvm") + { name: "gate-sulong-nwcc-llvm-jdk-latest-windows-amd64", timelimit: "30:00" },
8989
$.sulong + sc.post_merge + $.common() + sc.labsjdkLatest + sc.windows_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_c") + { name: "gate-sulong-gcc_c-jdk-latest-windows-amd64", timelimit: "45:00" },
9090
$.sulong + sc.post_merge + $.common() + sc.labsjdkLatest + sc.windows_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_cpp") + { name: "gate-sulong-gcc_cpp-jdk-latest-windows-amd64", timelimit: "45:00" },
9191
],

‎truffle/ci/ci.jsonnet‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@
240240
["mx", "benchmark", "truffle:*", "--", "--jvm", "server", "--jvm-config", "graal-core", "--", "com.oracle.truffle", "-f", "1", "-wi", "1", "-w", "1", "-i", "1", "-r", "1"],
241241
],
242242
targets: ["gate"],
243+
timelimit: "30:00",
243244
},
244245
],
245246

‎vm/ci/ci_common/common.jsonnet‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,7 @@ local devkits = graal_common.devkits;
582582
['mx', 'gate', '-B=--force-deprecation-as-warning', '--tags', 'style,fullbuild'],
583583
],
584584
name: 'gate-vm-style-' + self.jdk_name + "-linux-amd64",
585+
timelimit: '30:00',
585586
},
586587

587588
vm.vm_java_Latest + sulong_vm_tests,

‎vm/ci/ci_includes/vm.jsonnet‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
6464
'daily-deploy-vm-maven-linux-amd64',
6565
],
6666
notify_groups:: ['deploy'],
67+
timelimit: '30:00',
6768
},
6869

6970
maven_deploy_base_functions: {
@@ -91,13 +92,15 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
9192
['mx', 'unittest', '--suite', 'vm'],
9293
],
9394
name: 'gate-vm-unittest-linux-amd64',
95+
timelimit: '30:00',
9496
}, ['sdk', 'truffle', 'vm']),
9597
utils.add_gate_predicate(self.vm_java_Latest + graal_common.devkits['windows-jdkLatest'] + vm_common.vm_base('windows', 'amd64', 'gate') + {
9698
run: [
9799
['mx', 'build'],
98100
['mx', 'unittest', '--suite', 'vm'],
99101
],
100102
name: 'gate-vm-unittest-windows-amd64',
103+
timelimit: '30:00',
101104
}, ["sdk", "truffle", "vm"]),
102105
self.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'gate') + graal_common.deps.sulong + {
103106
environment+: {
@@ -109,6 +112,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
109112
['mx', 'gate', '--strict-mode', '--tags', 'build'],
110113
],
111114
name: 'gate-vm-build-without-vcs-linux-amd64',
115+
timelimit: '30:00',
112116
},
113117

114118
# Linux/AMD64
@@ -171,6 +175,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
171175
['bash', '-c', 'if [[ ${BRANCH_NAME} == master ]] || [[ ${BRANCH_NAME} == release/* ]] || [[ ${BRANCH_NAME} == cpu/* ]]; then git -C ${MX_HOME} push origin +HEAD:refs/heads/graal/${BRANCH_NAME}; fi']
172176
],
173177
name: 'post-merge-vm-update-stable-mx-branch-linux-amd64',
178+
timelimit: '30:00',
174179
notify_groups:: ['deploy'],
175180
},
176181

0 commit comments

Comments
 (0)