Skip to content

Commit

Permalink
Don't pass OPENSHIFT_IP env variable when building old BWC branches (#…
Browse files Browse the repository at this point in the history
…50153)

This commit tweaks the workaround introduced in #49211 to support
Gradle 6.0. In the workaround, we specifically override the address
the Gradle daemon binds to by passing the desired address via the
OPENSHIFT_IP environment variable. This works fine for builds using
Gradle 6.0, but for older Gradle versions this causes issues with
inter-daemon communication, specifically when we build BWC branches
not on Gradle 6.0. The fix here is to strip that environment variable
out when building the target BWC branch if that branch is on an
older Gradle version.

This is all temporary and will be removed when this bug fix is released
in Gradle 6.1.

Closes #50025
  • Loading branch information
mark-vieira committed Dec 12, 2019
1 parent 249334f commit e287427
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions distribution/bwc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import org.elasticsearch.gradle.Version
import org.elasticsearch.gradle.BwcVersions
import org.elasticsearch.gradle.info.BuildParams
import org.elasticsearch.gradle.info.GlobalBuildInfoPlugin
import org.gradle.util.GradleVersion

import java.nio.charset.StandardCharsets

Expand Down Expand Up @@ -161,6 +162,12 @@ bwcVersions.forPreviousUnreleased { BwcVersions.UnreleasedVersionInfo unreleased
spoolOutput = true
workingDir = checkoutDir
doFirst {
// TODO: Remove this once we've updated to Gradle 6.1
// Workaround for https://github.com/gradle/gradle/issues/11426
if (GradleVersion.version(file("${ checkoutDir}/buildSrc/src/main/resources/minimumGradleVersion").text) != GradleVersion.current()) {
environment = environment.findAll { key, val -> key != 'OPENSHIFT_IP' }
}

// Execution time so that the checkouts are available
List<String> lines = file("${checkoutDir}/.ci/java-versions.properties").readLines()
environment(
Expand Down

0 comments on commit e287427

Please sign in to comment.