Skip to content

Commit 30c6168

Browse files
authored
[9.0] [CI] Handle git snapshot BWC versions correctly when calculating jdk fallback (#135399) (#135410)
* [CI] Handle git snapshot BWC versions correctly when calculating jdk fallback (#135399) In #135300 we introduced a fallback to use adoptopenjdk17 when running bwc tests with older distributions. This fix handles the calculation of overriding requirement by taken 0.0.0 version into account which is used to represent versions representing git snapshots. (cherry picked from commit 6047a74) # Conflicts: # test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterFactory.java * Fix typo
1 parent 6089cf4 commit 30c6168

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ private void registerInternalDistributionResolutions(List<DistributionResolution
113113
String versionProperty = System.getProperty("tests.bwc.main.version");
114114
// We use this phony version as a placeholder for the real version
115115
if (distribution.getVersion().equals("0.0.0")) {
116+
if (versionProperty == null) {
117+
throw new GradleException("System property 'tests.bwc.main.version' expected for building bwc version.");
118+
}
116119
BwcVersions.UnreleasedVersionInfo unreleasedVersionInfo = new BwcVersions.UnreleasedVersionInfo(
117120
Version.fromString(versionProperty),
118121
"main",

build-tools/src/main/java/org/elasticsearch/gradle/util/OsUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ private OsUtils() {}
3838
* This method returns true if the given version of the JDK is known to be incompatible
3939
*/
4040
public static boolean jdkIsIncompatibleWithOS(Version version) {
41-
return version.onOrBefore("8.10.4") && isUbuntu2404OrLater();
41+
return version.after("0.0.0") && version.onOrBefore("8.10.4") && isUbuntu2404OrLater();
4242
}
4343

4444
private static boolean isUbuntu2404OrLater() {

test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterFactory.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public abstract class AbstractLocalClusterFactory<S extends LocalClusterSpec, H
8282
private static final String ENABLE_DEBUG_JVM_ARGS = "-agentlib:jdwp=transport=dt_socket,server=n,suspend=y,address=";
8383
private static final String ENTITLEMENT_POLICY_YAML = "entitlement-policy.yaml";
8484
private static final String PLUGIN_DESCRIPTOR_PROPERTIES = "plugin-descriptor.properties";
85-
public static final String DISTRO_WITH_JDK_LOWER_21 = "8.11.0";
85+
public static final String FIRST_DISTRO_WITH_JDK_21 = "8.11.0";
8686

8787
private final DistributionResolver distributionResolver;
8888

@@ -864,7 +864,7 @@ private void startElasticsearch() {
864864
private Map<String, String> getEnvironmentVariables() {
865865
Map<String, String> environment = new HashMap<>(spec.resolveEnvironment());
866866
String esFallbackJavaHome = System.getenv("ES_FALLBACK_JAVA_HOME");
867-
if (spec.getVersion().before(DISTRO_WITH_JDK_LOWER_21) && esFallbackJavaHome != null && esFallbackJavaHome.isEmpty() == false) {
867+
if (jdkIsIncompatible(spec.getVersion()) && esFallbackJavaHome != null && esFallbackJavaHome.isEmpty() == false) {
868868
environment.put("ES_JAVA_HOME", esFallbackJavaHome);
869869
}
870870
environment.put("ES_PATH_CONF", configDir.toString());
@@ -917,6 +917,10 @@ private Map<String, String> getEnvironmentVariables() {
917917
return environment;
918918
}
919919

920+
private boolean jdkIsIncompatible(Version version) {
921+
return version.after("0.0.0") && version.before(FIRST_DISTRO_WITH_JDK_21);
922+
}
923+
920924
private Map<String, String> getJvmOptionsReplacements() {
921925
return Map.of(
922926
"-XX:HeapDumpPath=data",

0 commit comments

Comments
 (0)