|
2 | 2 | local common = import '../../ci/ci_common/common.jsonnet',
|
3 | 3 | local utils = import '../../ci/ci_common/common-utils.libsonnet',
|
4 | 4 |
|
| 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 | + |
5 | 9 | 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, |
7 | 11 | setup: [
|
8 | 12 | ["cd", "./sdk"],
|
9 | 13 | ],
|
|
19 | 23 | },
|
20 | 24 |
|
21 | 25 | 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"), |
26 | 30 | common.darwin_amd64 + common.oraclejdkLatest + sdk_gate("daily"),
|
27 | 31 | common.darwin_amd64 + common.oraclejdk21 + sdk_gate("daily"),
|
28 | 32 | ],
|
|
0 commit comments