Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't pass OPENSHIFT_IP env variable when building old BWC branches #50153

Merged
merged 3 commits into from
Dec 12, 2019
Merged

Don't pass OPENSHIFT_IP env variable when building old BWC branches #50153

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1605dd6
Don't pass OPENSHIFT_IP env variable when building old BWC branches
mark-vieira Dec 12, 2019
43ff856
Merge branch 'master' into gradle-6.0-addressing-fix
elasticmachine Dec 12, 2019
32cc62a
Remove temporary debugging output
mark-vieira Dec 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions distribution/bwc/build.gradle
View file
Open in desktop
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,13 @@ 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' }
environment.forEach { key, val -> println("$key=$val") }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this leftover debug?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I'll remove this once everything is green.

}

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