This is an automated email from the ASF dual-hosted git repository.
jooger pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new e6797d2c360 IGNITE-27523 Set Java 17 for gradle runner to make it
compatible with Java 25+ runs (#7525)
e6797d2c360 is described below
commit e6797d2c36078909043dbaf0371056c4db0107bd
Author: Artem Egorov <[email protected]>
AuthorDate: Tue Mar 3 11:32:23 2026 +0200
IGNITE-27523 Set Java 17 for gradle runner to make it compatible with Java
25+ runs (#7525)
---
.teamcity/_Self/Project.kt | 3 +--
.teamcity/build/distributions/CppClientPackages.kt | 6 ++++--
.teamcity/test/build_types/RunAllTestsCustomJDK.kt | 2 +-
.teamcity/test/platform_tests/PlatformCppOdbcTestsDebLinux.kt | 2 +-
.teamcity/test/platform_tests/PlatformCppOdbcTestsRpmLinux.kt | 2 +-
.teamcity/test/platform_tests/PlatformCppOdbcTestsTgzLinux.kt | 2 +-
.teamcity/test/template_types/OtherTestsModule.kt | 4 ++--
.teamcity/test/template_types/TestsModule.kt | 4 ++--
8 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/.teamcity/_Self/Project.kt b/.teamcity/_Self/Project.kt
index af054ea6583..ed7a701b191 100644
--- a/.teamcity/_Self/Project.kt
+++ b/.teamcity/_Self/Project.kt
@@ -22,8 +22,7 @@ object Project : Project({
hiddenPassword("DOCKERPROXY_PASSWORD",
"credentialsJSON:56ca9b55-a5ad-4244-a5c1-5b4f062366dd")
hiddenText("system.lastCommitHash", "%build.vcs.number%")
hiddenText("IGNITE_CI", "true")
- hiddenText("env.GRADLE_OPTS", "-Dorg.gradle.caching=true")
- hiddenText("env.JAVA_HOME", "%env.JDK_ORA_17%")
+ hiddenText("env.GRADLE_OPTS", "-Dorg.gradle.caching=true
-Dorg.gradle.java.home=%env.JDK_ORA_17%")
hiddenText("env.M2_HOME", "%teamcity.tool.maven.DEFAULT%")
hiddenText("teamcity.internal.docker.busybox",
"docker.gridgain.com/dockerhub-proxy/busybox:latest")
}
diff --git a/.teamcity/build/distributions/CppClientPackages.kt
b/.teamcity/build/distributions/CppClientPackages.kt
index b82cb5c81d8..6bddd0b5314 100644
--- a/.teamcity/build/distributions/CppClientPackages.kt
+++ b/.teamcity/build/distributions/CppClientPackages.kt
@@ -2,8 +2,10 @@ package build.distributions
import jetbrains.buildServer.configs.kotlin.BuildType
import jetbrains.buildServer.configs.kotlin.buildSteps.GradleBuildStep
+import jetbrains.buildServer.configs.kotlin.buildSteps.gradle
import org.apache.ignite.teamcity.CustomBuildSteps.Companion.customGradle
import org.apache.ignite.teamcity.CustomBuildSteps.Companion.customScript
+import org.apache.ignite.teamcity.Teamcity.Companion.hiddenText
object CppClientPackages : BuildType({
name = "[11] ODBC and C++ Client packages"
@@ -35,7 +37,7 @@ object CppClientPackages : BuildType({
name = "Setup Docker Proxy"
}
- customGradle {
+ gradle {
name = "Build ODBC and Client packages. RPM, DEB, TGZ. (Under
Rocky Linux 8 container)"
tasks = ":platforms:cmakeCpack"
workingDir = "%VCSROOT__IGNITE3%"
@@ -43,7 +45,7 @@ object CppClientPackages : BuildType({
dockerImage = "docker.gridgain.com/ci/tc-rockylinux8-odbc:v1.1"
dockerPull = true
dockerImagePlatform = GradleBuildStep.ImagePlatform.Linux
- dockerRunParameters = "-e JAVA_HOME=%CONTAINER_JAVA_HOME%"
+ dockerRunParameters = "-e JAVA_HOME=%CONTAINER_JAVA_HOME% -e
GRADLE_OPTS=\"-Dorg.gradle.caching=true\""
}
}
})
diff --git a/.teamcity/test/build_types/RunAllTestsCustomJDK.kt
b/.teamcity/test/build_types/RunAllTestsCustomJDK.kt
index bd083d5fe3f..9157dd834eb 100644
--- a/.teamcity/test/build_types/RunAllTestsCustomJDK.kt
+++ b/.teamcity/test/build_types/RunAllTestsCustomJDK.kt
@@ -12,7 +12,7 @@ import test.template_types.RunTestsList
object RunAllTestsCustomJDK : BuildType({
id(getId(this::class))
- name = "--> Run :: All Tests [JDK 11/21]"
+ name = "--> Run :: All Tests [JDK 17/21/25]"
description = "Run all tests on custom JDK at once"
type = Type.COMPOSITE
diff --git a/.teamcity/test/platform_tests/PlatformCppOdbcTestsDebLinux.kt
b/.teamcity/test/platform_tests/PlatformCppOdbcTestsDebLinux.kt
index ea901c29fa4..e9435c29f32 100644
--- a/.teamcity/test/platform_tests/PlatformCppOdbcTestsDebLinux.kt
+++ b/.teamcity/test/platform_tests/PlatformCppOdbcTestsDebLinux.kt
@@ -49,7 +49,7 @@ object PlatformCppOdbcTestsDebLinux : BuildType({
script {
name = "Install ODBC and build C++ tests in Ubuntu 22.04 container"
dockerImage = "docker.gridgain.com/ci/tc-ubuntu22_04-odbc:v1.0"
- dockerRunParameters = "-e JAVA_HOME=%CONTAINER_JAVA_HOME% --ulimit
nofile=32768:32768"
+ dockerRunParameters = "-e JAVA_HOME=%CONTAINER_JAVA_HOME% -e
GRADLE_OPTS=\"-Dorg.gradle.caching=true\" --ulimit nofile=32768:32768"
scriptContent = """
clang --version
clang++ --version
diff --git a/.teamcity/test/platform_tests/PlatformCppOdbcTestsRpmLinux.kt
b/.teamcity/test/platform_tests/PlatformCppOdbcTestsRpmLinux.kt
index 0b4e5a07e46..40d5a89ea91 100644
--- a/.teamcity/test/platform_tests/PlatformCppOdbcTestsRpmLinux.kt
+++ b/.teamcity/test/platform_tests/PlatformCppOdbcTestsRpmLinux.kt
@@ -49,7 +49,7 @@ object PlatformCppOdbcTestsRpmLinux : BuildType({
script {
name = "Install ODBC and build C++ tests in Rockylinux 8 container"
dockerImage = "docker.gridgain.com/ci/tc-rockylinux8-odbc:v1.1"
- dockerRunParameters = "-e JAVA_HOME=%CONTAINER_JAVA_HOME% --ulimit
nofile=32768:32768"
+ dockerRunParameters = "-e JAVA_HOME=%CONTAINER_JAVA_HOME% -e
GRADLE_OPTS=\"-Dorg.gradle.caching=true\" --ulimit nofile=32768:32768"
scriptContent = """
clang --version
clang++ --version
diff --git a/.teamcity/test/platform_tests/PlatformCppOdbcTestsTgzLinux.kt
b/.teamcity/test/platform_tests/PlatformCppOdbcTestsTgzLinux.kt
index dd31aca1615..dae6fa5ef03 100644
--- a/.teamcity/test/platform_tests/PlatformCppOdbcTestsTgzLinux.kt
+++ b/.teamcity/test/platform_tests/PlatformCppOdbcTestsTgzLinux.kt
@@ -49,7 +49,7 @@ object PlatformCppOdbcTestsTgzLinux : BuildType({
script {
name = "Install ODBC and build C++ tests in Ubuntu 22.04 container"
dockerImage = "docker.gridgain.com/ci/tc-ubuntu22_04-odbc:v1.0"
- dockerRunParameters = "-e JAVA_HOME=%CONTAINER_JAVA_HOME% --ulimit
nofile=32768:32768"
+ dockerRunParameters = "-e JAVA_HOME=%CONTAINER_JAVA_HOME% -e
GRADLE_OPTS=\"-Dorg.gradle.caching=true\" --ulimit nofile=32768:32768"
scriptContent = """
clang --version
clang++ --version
diff --git a/.teamcity/test/template_types/OtherTestsModule.kt
b/.teamcity/test/template_types/OtherTestsModule.kt
index 31a54e831d0..e7f41a96091 100644
--- a/.teamcity/test/template_types/OtherTestsModule.kt
+++ b/.teamcity/test/template_types/OtherTestsModule.kt
@@ -25,7 +25,7 @@ class OtherTestsModule(
hiddenText("IGNITE_COMPATIBILITY_TEST_ALL_VERSIONS",
"-DtestAllVersions=false")
hiddenText("IGNITE_DEFAULT_STORAGE_ENGINE", "")
- hiddenText("env.GRADLE_OPTS",
"-PextraJvmArgs=\"%IGNITE_COMPATIBILITY_TEST_ALL_VERSIONS%
%IGNITE_DEFAULT_STORAGE_ENGINE%\"")
+ hiddenText("EXTRA_GRADLE_OPTS",
"-PextraJvmArgs=\"%IGNITE_COMPATIBILITY_TEST_ALL_VERSIONS%
%IGNITE_DEFAULT_STORAGE_ENGINE%\"")
}
steps {
@@ -43,7 +43,7 @@ class OtherTestsModule(
tasks = configuration.testTask + " " +
excludeModules.joinToString(" ") { "-x " +
it.mainTask(configuration.testTask) }
workingDir = "%VCSROOT__IGNITE3%"
- gradleParams = "%env.GRADLE_OPTS%"
+ gradleParams = "%env.GRADLE_OPTS% %EXTRA_GRADLE_OPTS%"
this.jvmArgs = """
-Xmx%XMX%
%JVM_ARGS%
diff --git a/.teamcity/test/template_types/TestsModule.kt
b/.teamcity/test/template_types/TestsModule.kt
index 7bf55261f14..d92dc76a633 100644
--- a/.teamcity/test/template_types/TestsModule.kt
+++ b/.teamcity/test/template_types/TestsModule.kt
@@ -26,7 +26,7 @@ class TestsModule(
hiddenText("IGNITE_COMPATIBILITY_TEST_ALL_VERSIONS",
"-DtestAllVersions=false")
hiddenText("IGNITE_DEFAULT_STORAGE_ENGINE", "")
- hiddenText("env.GRADLE_OPTS",
"-PextraJvmArgs=\"%IGNITE_COMPATIBILITY_TEST_ALL_VERSIONS%
%IGNITE_DEFAULT_STORAGE_ENGINE%\"")
+ hiddenText("EXTRA_GRADLE_OPTS",
"-PextraJvmArgs=\"%IGNITE_COMPATIBILITY_TEST_ALL_VERSIONS%
%IGNITE_DEFAULT_STORAGE_ENGINE%\"")
}
steps {
@@ -42,7 +42,7 @@ class TestsModule(
name = "Run tests"
tasks = module.buildTask(configuration.testTask)
workingDir = "%VCSROOT__IGNITE3%"
- gradleParams = "%env.GRADLE_OPTS%"
+ gradleParams = "%env.GRADLE_OPTS% %EXTRA_GRADLE_OPTS%"
jvmArgs = """
-Xmx%XMX%
%JVM_ARGS%
