Skip to content

Upgrade to Gradle 6.0 #49211

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.

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

Merged
merged 8 commits into from
Dec 6, 2019
Merged

Conversation

mark-vieira
Copy link
Contributor

@mark-vieira mark-vieira commented Nov 15, 2019

This upgrade required a few significant changes. Firstly, the build
scan plugin has been renamed, and changed to be a Settings plugin rather
than a project plugin so the declaration of this has moved to our
settings.gradle file. Second, we were using a rather old version of the
Nebula ospackage plugin for building deb and rpm packages, the migraiton
to the latest version required some updates to get things working as
expected as we had some workarounds in place that are no longer
applicable with the latest bug fixes.

Closes #49192

@mark-vieira mark-vieira added the :Delivery/Build Build or test infrastructure label Nov 15, 2019
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra (:Core/Infra/Build)

@mark-vieira mark-vieira added the :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts label Nov 15, 2019
@mark-vieira
Copy link
Contributor Author

@elasticmachine run elasticsearch-ci/1

Copy link
Contributor

@alpar-t alpar-t left a comment

Choose a reason for hiding this comment

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

LGTM

I would run PR checks a few times over for this one.

@mark-vieira
Copy link
Contributor Author

Something is definitely funky with those test worker failures. I'm going to have to track that down before we merge this.

@mark-vieira
Copy link
Contributor Author

@elasticmachine test this please

@mark-vieira
Copy link
Contributor Author

Still running into issues with the Gradle daemon failing to get a connection to the test worker. Working with folks at Gradle to try and troubleshoot this.

@original-brownbear
Copy link
Member

@mark-vieira I think we can add a "closes #49253" here as well? :) Gradle 6 should resolve any JDK 13 issues right?

@mark-vieira
Copy link
Contributor Author

@mark-vieira I think we can add a "closes #49253" here as well? :) Gradle 6 should resolve any JDK 13 issues right?

Not necessarily. Gradle 6.0 simply adds support for running the build with JDK 13 but we could still have test failures when using a JDK 13 test runtime. This PR isn't meant to specifically address those issues, simply to get us on the latest version and then take it from there.

@mark-vieira
Copy link
Contributor Author

@jbaiera Heads up that I'm in the process of getting us on Gradle 6.0. It might be worth some experiments to see how elasticsearch-hadoop plays with Gradle 6.0 so we can coordinate and make sure we don't break stuff.

@mark-vieira
Copy link
Contributor Author

@elasticmachine run elasticsearch-ci/1

@mark-vieira
Copy link
Contributor Author

@elasticmachine update branch

@mark-vieira
Copy link
Contributor Author

@elasticmachine run elasticsearch-ci/packaging-matrix

@mark-vieira
Copy link
Contributor Author

@elasticmachine test this please

This upgrade required a few significant changes. Firstly, the build
scan plugin has been renamed, and changed to be a Settings plugin rather
than a project plugin so the declaration of this has moved to our
settings.gradle file. Second, we were using a rather old version of the
Nebula ospackage plugin for building deb and rpm packages, the migraiton
to the latest version required some updates to get things working as
expected as we had some workarounds in place that are no longer
applicable with the latest bug fixes.

Signed-off-by: Mark Vieira <[email protected]>
Signed-off-by: Mark Vieira <[email protected]>
@mark-vieira
Copy link
Contributor Author

@elasticmachine run elasticsearch-ci/packaging-matrix

@mark-vieira
Copy link
Contributor Author

@elasticmachine update branch

@mark-vieira
Copy link
Contributor Author

@elasticmachine run elasticsearch-ci/packaging-matrix

@mark-vieira mark-vieira merged commit 87f9c16 into elastic:master Dec 6, 2019
mark-vieira added a commit to mark-vieira/elasticsearch that referenced this pull request Dec 9, 2019
This upgrade required a few significant changes. Firstly, the build
scan plugin has been renamed, and changed to be a Settings plugin rather
than a project plugin so the declaration of this has moved to our
settings.gradle file. Second, we were using a rather old version of the
Nebula ospackage plugin for building deb and rpm packages, the migration
to the latest version required some updates to get things working as
expected as we had some workarounds in place that are no longer
applicable with the latest bug fixes.

(cherry picked from commit 87f9c16)
mark-vieira added a commit that referenced this pull request Dec 9, 2019
This upgrade required a few significant changes. Firstly, the build
scan plugin has been renamed, and changed to be a Settings plugin rather
than a project plugin so the declaration of this has moved to our
settings.gradle file. Second, we were using a rather old version of the
Nebula ospackage plugin for building deb and rpm packages, the migration
to the latest version required some updates to get things working as
expected as we had some workarounds in place that are no longer
applicable with the latest bug fixes.

(cherry picked from commit 87f9c16)
@mark-vieira mark-vieira deleted the gradle-6.0-upgrade branch December 9, 2019 20:22
droberts195 added a commit to droberts195/ml-cpp that referenced this pull request Dec 11, 2019
Elasticsearch has recently upgraded to version 6.0.1
(see elastic/elasticsearch#49211) and it's best if
the ml-cpp repo is consistent at least in the major
version of Gradle that is used.

When ml-cpp is built alongside elasticsearch via the
elasticsearch-extra directory it will be using the
Gradle chosen by the elasticsearch repo, so it's
best if that version is also used when building ml-cpp
standalone to avoid integration incompatibilities.
droberts195 added a commit to elastic/ml-cpp that referenced this pull request Dec 11, 2019
Elasticsearch has recently upgraded to version 6.0.1
(see elastic/elasticsearch#49211) and it's best if
the ml-cpp repo is consistent at least in the major
version of Gradle that is used.

When ml-cpp is built alongside elasticsearch via the
elasticsearch-extra directory it will be using the
Gradle chosen by the elasticsearch repo, so it's
best if that version is also used when building ml-cpp
standalone to avoid integration incompatibilities.
droberts195 added a commit to droberts195/ml-cpp that referenced this pull request Dec 11, 2019
Elasticsearch has recently upgraded to version 6.0.1
(see elastic/elasticsearch#49211) and it's best if
the ml-cpp repo is consistent at least in the major
version of Gradle that is used.

When ml-cpp is built alongside elasticsearch via the
elasticsearch-extra directory it will be using the
Gradle chosen by the elasticsearch repo, so it's
best if that version is also used when building ml-cpp
standalone to avoid integration incompatibilities.

Backport of elastic#891
mark-vieira added a commit to mark-vieira/elasticsearch that referenced this pull request Dec 12, 2019
This commit tweaks the workaround introduced in elastic#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 elastic#50025

Signed-off-by: Mark Vieira <[email protected]>
mark-vieira added a commit that referenced this pull request Dec 12, 2019
…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
mark-vieira added a commit that referenced this pull request Dec 12, 2019
…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
droberts195 added a commit to elastic/ml-cpp that referenced this pull request Dec 13, 2019
Elasticsearch has recently upgraded to version 6.0.1
(see elastic/elasticsearch#49211) and it's best if
the ml-cpp repo is consistent at least in the major
version of Gradle that is used.

When ml-cpp is built alongside elasticsearch via the
elasticsearch-extra directory it will be using the
Gradle chosen by the elasticsearch repo, so it's
best if that version is also used when building ml-cpp
standalone to avoid integration incompatibilities.

Backport of #891
SivagurunathanV pushed a commit to SivagurunathanV/elasticsearch that referenced this pull request Jan 23, 2020
This upgrade required a few significant changes. Firstly, the build
scan plugin has been renamed, and changed to be a Settings plugin rather
than a project plugin so the declaration of this has moved to our
settings.gradle file. Second, we were using a rather old version of the
Nebula ospackage plugin for building deb and rpm packages, the migration
to the latest version required some updates to get things working as
expected as we had some workarounds in place that are no longer
applicable with the latest bug fixes.
SivagurunathanV pushed a commit to SivagurunathanV/elasticsearch that referenced this pull request Jan 23, 2020
…lastic#50153)

This commit tweaks the workaround introduced in elastic#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 elastic#50025
@mark-vieira mark-vieira added the Team:Delivery Meta label for Delivery team label Nov 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:Delivery/Build Build or test infrastructure :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts Team:Delivery Meta label for Delivery team v7.6.0 v8.0.0-alpha1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade to Gradle 6.0
5 participants