Skip to content

Commit 2bd2ea2

Browse files
rschatzrschatz
committed
Adopt gate tiers in Sulong.
1 parent 4f61e16 commit 2bd2ea2

File tree

2 files changed

+34
-30
lines changed

2 files changed

+34
-30
lines changed

‎sulong/ci/ci.jsonnet‎

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ local sc = (import "ci_common/sulong-common.jsonnet");
1010
local basicTags = "build,sulongBasic,nwcc,llvm",
1111
local basicTagsNoNWCC= "build,sulongBasic,llvm",
1212

13+
local tier1 = common.frequencies.tier1,
14+
local tier2 = common.frequencies.tier2,
15+
local tier3 = common.frequencies.tier3,
16+
1317
sulong:: {
1418
suite:: "sulong",
1519
extra_mx_args+:: if self._jdkIsGraalVM then [] else [ "--dynamicimport", "/compiler" ],
@@ -18,7 +22,7 @@ local sc = (import "ci_common/sulong-common.jsonnet");
1822
],
1923
},
2024

21-
gate(standalone=false, style=false):: sc.gate + {
25+
common(standalone=false, style=false):: {
2226
setup+: [
2327
['apply-predicates', '--delete-excluded', '--process-hidden', '--pattern-root', '..'] # we are in the sulong directory
2428
+ (if std.objectHasAll(self.guard, 'excludes') then ['--exclude=' + e for e in self.guard.excludes] else [])
@@ -66,33 +70,34 @@ local sc = (import "ci_common/sulong-common.jsonnet");
6670
},
6771

6872
regular_builds:: [
69-
$.sulong + $.gate(style=true) + sc.labsjdkLatest + sc.linux_amd64 + sc.style + { name: "gate-sulong-style-fullbuild-jdk-latest-linux-amd64" },
70-
$.sulong + $.gate(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" },
71-
$.sulong + $.gate() + 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" },
72-
$.sulong + $.gate() + 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" },
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" },
76+
$.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" },
77+
$.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" },
7378

74-
$.sulong + $.gate() + 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"], targets: []} + sc.daily,
79+
$.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"] },
7580

76-
$.sulong + $.gate() + 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" },
7782

78-
$.sulong + $.gate() + sc.labsjdkLatest + sc.linux_aarch64 + sc.llvmBundled + sc.requireGMP + sc.gateTags(basicTagsNoNWCC) + { name: "gate-sulong-basic-llvm-jdk-latest-linux-aarch64", timelimit: "30:00" },
83+
$.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" },
7984

80-
$.sulong + $.gate() + sc.labsjdkLatest + sc.darwin_aarch64 + sc.llvmBundled + sc.requireGMP + sc.gateTags(basicTagsNoNWCC) + { name: "gate-sulong-basic-llvm-jdk-latest-darwin-aarch64", timelimit: "30:00" },
85+
$.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" },
8186

82-
$.sulong + $.gate() + 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" },
83-
$.sulong + $.gate() + sc.labsjdkLatest + sc.windows_amd64 + sc.llvmBundled + sc.gateTags("build,nwcc,llvm") + { name: "gate-sulong-nwcc-llvm-jdk-latest-windows-amd64" },
84-
$.sulong + $.gate() + 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" },
85-
$.sulong + $.gate() + 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" },
87+
$.sulong + tier3 + $.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" },
89+
$.sulong + tier3 + $.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" },
90+
$.sulong + tier3 + $.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" },
8691
],
8792

8893
standalone_builds::
8994
sc.mapPrototypePlatformName(
9095
[
91-
$.sulong + $.gate(standalone=true) + sc.gateTags("standalone") {
96+
$.sulong + $.common(standalone=true) + sc.gateTags("standalone") {
9297
job:: "test-ce-standalones-jvm",
9398
extra_mx_args+:: ["--env", "ce-llvm-standalones", "--use-llvm-standalone=jvm"],
9499
},
95-
$.sulong + $.gate(standalone=true) + sc.gateTags("standalone") {
100+
$.sulong + $.common(standalone=true) + sc.gateTags("standalone") {
96101
job:: "test-ce-standalones-native",
97102
extra_mx_args+:: ["--env", "ce-llvm-standalones", "--use-llvm-standalone=native"],
98103
},
@@ -105,16 +110,16 @@ local sc = (import "ci_common/sulong-common.jsonnet");
105110
[sc.darwin_aarch64, [sc.labsjdkLatest]],
106111
],
107112
[
108-
{ name: "gate-sulong-test-ce-standalones-jvm-jdk-latest-linux-amd64", timelimit: "1:00:00" },
109-
{ name: "daily-sulong-test-ce-standalones-jvm-jdk-latest-darwin-amd64", timelimit: "1:00:00", targets: [] } + sc.daily,
110-
{ name: "daily-sulong-test-ce-standalones-jvm-jdk-latest-windows-amd64", timelimit: "1:00:00", targets: [] } + sc.daily /* GR-50165 */,
111-
{ name: "gate-sulong-test-ce-standalones-jvm-jdk-latest-linux-aarch64", timelimit: "1:00:00" },
112-
{ name: "gate-sulong-test-ce-standalones-jvm-jdk-latest-darwin-aarch64", timelimit: "1:00:00" },
113-
{ name: "gate-sulong-test-ce-standalones-native-jdk-latest-linux-amd64", timelimit: "1:30:00" },
114-
{ name: "daily-sulong-test-ce-standalones-native-jdk-latest-darwin-amd64", timelimit: "1:00:00", targets: [] } + sc.daily,
115-
{ name: "daily-sulong-test-ce-standalones-native-jdk-latest-windows-amd64", timelimit: "1:00:00", targets: [] } + sc.daily /* GR-50165 */,
116-
{ name: "gate-sulong-test-ce-standalones-native-jdk-latest-linux-aarch64", timelimit: "1:00:00" },
117-
{ name: "gate-sulong-test-ce-standalones-native-jdk-latest-darwin-aarch64", timelimit: "1:00:00" },
113+
tier2 + { name: "gate-sulong-test-ce-standalones-jvm-jdk-latest-linux-amd64", timelimit: "1:00:00" },
114+
sc.daily + { name: "daily-sulong-test-ce-standalones-jvm-jdk-latest-darwin-amd64", timelimit: "1:00:00", targets: [] },
115+
sc.daily + { name: "daily-sulong-test-ce-standalones-jvm-jdk-latest-windows-amd64", timelimit: "1:00:00", targets: [] } /* GR-50165 */,
116+
tier3 + { name: "gate-sulong-test-ce-standalones-jvm-jdk-latest-linux-aarch64", timelimit: "1:00:00" },
117+
tier3 + { name: "gate-sulong-test-ce-standalones-jvm-jdk-latest-darwin-aarch64", timelimit: "1:00:00" },
118+
tier2 + { name: "gate-sulong-test-ce-standalones-native-jdk-latest-linux-amd64", timelimit: "1:30:00" },
119+
sc.daily + { name: "daily-sulong-test-ce-standalones-native-jdk-latest-darwin-amd64", timelimit: "1:00:00", targets: [] },
120+
sc.daily + { name: "daily-sulong-test-ce-standalones-native-jdk-latest-windows-amd64", timelimit: "1:00:00", targets: [] } /* GR-50165 */,
121+
tier3 + { name: "gate-sulong-test-ce-standalones-native-jdk-latest-linux-aarch64", timelimit: "1:00:00" },
122+
tier3 + { name: "gate-sulong-test-ce-standalones-native-jdk-latest-darwin-aarch64", timelimit: "1:00:00" },
118123
]),
119124

120125
coverage_builds::

‎sulong/ci/ci_common/sulong-common.jsonnet‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@ local sulong_deps = common.deps.sulong;
8989
notify_groups:: ["sulong"],
9090
},
9191

92-
gate:: {
93-
targets+: ["gate"],
94-
},
95-
9692
daily:: $.sulong_notifications {
9793
targets+: ["daily"],
9894
},
@@ -154,10 +150,13 @@ local sulong_deps = common.deps.sulong;
154150
gateTags:: std.split(tags, ","),
155151
},
156152

157-
style:: common.deps.eclipse + common.deps.jdt + common.deps.spotbugs + $.gateTags("style,fullbuild") + {
153+
local strict_gate(tags) = $.gateTags(tags) + {
158154
extra_gate_args+:: ["--strict-mode"],
159155
},
160156

157+
style:: common.deps.eclipse + strict_gate("style"),
158+
fullbuild:: common.deps.jdt + common.deps.spotbugs + strict_gate("fullbuild"),
159+
161160
coverage(builds):: $.llvmBundled + $.requireGMP + $.mxGate + {
162161
local sameArchBuilds = std.filter(function(b) b.os == self.os && b.arch == self.arch, builds),
163162
local allTags = std.set(std.flattenArrays([b.gateTags for b in sameArchBuilds if std.objectHasAll(b, "gateTags")])),

0 commit comments

Comments
 (0)