diff --git a/ci.jsonnet b/ci.jsonnet index 5572924893e2..046ca836bda4 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -50,7 +50,7 @@ local libgraal(builds, include=true) = [b for b in builds if (std.findSubstr("li assert std.length(std.toString(import 'ci/ci_common/common.jsonnet')) > 0, ci_resources:: (import 'ci/ci_common/ci-resources.libsonnet'), overlay: graal_common.ci.overlay, - specVersion: "4", + specVersion: "7", tierConfig: { tier1: "gate", tier2: "gate", diff --git a/ci/ci_common/common.jsonnet b/ci/ci_common/common.jsonnet index 1cfc8ef29b9c..1f1684068a53 100644 --- a/ci/ci_common/common.jsonnet +++ b/ci/ci_common/common.jsonnet @@ -132,7 +132,7 @@ common + common.frequencies + { }, local linux_deps_extras = { packages+: { - "apache/ant": ">=1.9.4", + "apache/ant": "==1.10.1", }, }, diff --git a/graal-common.json b/graal-common.json index e74a54c299cf..0f4d4f6f4978 100644 --- a/graal-common.json +++ b/graal-common.json @@ -1,6 +1,6 @@ { "README": "This file contains definitions that are useful for the jsonnet CI files of the graal and graal-enterprise repositories.", "ci": { - "overlay": "fdd1c23beaa26526a6d9b6c5dc5ee66feb64672c" + "overlay": "3e032b0adc64c05bbd0aef1c116f4e69796aee9e", } } diff --git a/truffle/ci/ci.jsonnet b/truffle/ci/ci.jsonnet index 72437d1eb8ac..0c03983ce48c 100644 --- a/truffle/ci/ci.jsonnet +++ b/truffle/ci/ci.jsonnet @@ -83,7 +83,7 @@ name: 'gate-external-mvn-simplelanguage-' + self.jdk_name, packages+: { maven: "==3.3.9", - ruby: ">=2.1.0", + ruby: "==3.0.2", }, mx_cmd: ["mx"], run+: [ diff --git a/visualizer/ci/ci.jsonnet b/visualizer/ci/ci.jsonnet index c7daf90634e3..fdaaa26f91ce 100644 --- a/visualizer/ci/ci.jsonnet +++ b/visualizer/ci/ci.jsonnet @@ -34,7 +34,7 @@ linux_maven: { packages+: { - maven: '>=3.3.9', + maven: '==3.9.10', }, }, diff --git a/vm/ci/ci_common/common.jsonnet b/vm/ci/ci_common/common.jsonnet index 72af2b2520ee..4da574dd94d4 100644 --- a/vm/ci/ci_common/common.jsonnet +++ b/vm/ci/ci_common/common.jsonnet @@ -467,7 +467,7 @@ local devkits = graal_common.devkits; linux_deploy: self.deploy_build + { packages+: { - maven: '>=3.3.9', + maven: '==3.5.3', }, }, diff --git a/vm/ci/ci_includes/vm-native.jsonnet b/vm/ci/ci_includes/vm-native.jsonnet index a3128449eeeb..586587c24fdd 100644 --- a/vm/ci/ci_includes/vm-native.jsonnet +++ b/vm/ci/ci_includes/vm-native.jsonnet @@ -35,7 +35,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; components+: ["truffle"], timelimit: '30:00', packages+: { - maven: '>=3.3.9', + maven: '==3.5.3', }, name: self.targets[0] + '-vm-ce-truffle-maven-downloader-labs' + self.jdk_name + '-linux-amd64', }, diff --git a/web-image/ci/ci_common/common.jsonnet b/web-image/ci/ci_common/common.jsonnet index f78d81c3c439..67aa0ad9c00d 100644 --- a/web-image/ci/ci_common/common.jsonnet +++ b/web-image/ci/ci_common/common.jsonnet @@ -54,7 +54,7 @@ local node_map = { maven: { packages+: { - maven: '>=3.6.3', + maven: '==3.9.10', }, }, diff --git a/web-image/ci/ci_common/wi-run-spec.jsonnet b/web-image/ci/ci_common/wi-run-spec.jsonnet index e1c4713c18f2..ef2b5f9d19ca 100644 --- a/web-image/ci/ci_common/wi-run-spec.jsonnet +++ b/web-image/ci/ci_common/wi-run-spec.jsonnet @@ -34,7 +34,7 @@ local os_arch_jdk_mixin(mapping) = r.task_spec(r.evaluate_late({ docker_ol8: { docker: { - image: 'phx.ocir.io/oraclelabs2/c_graal/buildslave:buildslave_ol8', + image: 'buildslave_ol8', mount_modules: true, }, },