Update Gradle to 8.0 #5666

reta · 2022-12-30T21:57:16Z

Signed-off-by: Andriy Redko andriy.redko@aiven.io

Description

The first Gradle 8.0 is out, starting the draft pull request to understand required efforts for migration.

Issues Resolved

N/A

Check List

New functionality includes testing.
- All tests pass
New functionality has been documented.
- New functionality has javadoc added
Commits are signed per the DCO using --signoff
Commit changes are listed out in CHANGELOG.md file (See: Changelog)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

github-actions · 2022-12-30T21:59:28Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/8654/
CommitID: 740a7fd
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

github-actions · 2023-01-06T15:08:04Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/8954/
CommitID: 0459264
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

github-actions · 2023-01-09T17:52:39Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/9094/
CommitID: 63de475
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

github-actions · 2023-01-10T15:56:07Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/9200/
CommitID: cb36e3b
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

dblock · 2023-01-10T17:33:13Z

@reta When are you going to write a GHA and publish it on the marketplace to upgrade gradle to the latest? :) Or should dependabot do it?

reta · 2023-01-10T17:50:31Z

@reta When are you going to write a GHA and publish it on the marketplace to upgrade gradle to the latest? :) Or should dependabot do it?

@dblock Uh ... each Gradle update is a nightmare ... even minor ... :( This one is not the exception :(

github-actions · 2023-01-10T19:24:04Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/9219/
CommitID: 8223bf0
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

reta · 2023-01-11T13:53:20Z

Gradle Check (Jenkins) Run Completed with:

* **RESULT:** FAILURE x

* **URL:** https://build.ci.opensearch.org/job/gradle-check/9200/

* **CommitID:** [cb36e3b](https://github.com/opensearch-project/OpenSearch/commit/cb36e3b42b9964c467f559b1307ce32b3bcaa1e3)
  Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
  Is the failure [a flaky test](https://github.com/opensearch-project/OpenSearch/blob/main/DEVELOPER_GUIDE.md#flaky-tests) unrelated to your change?

 jar1: /home/ubuntu/.gradle/caches/modules-2/files-2.1/junit/junit/4.13.2/8ac9e16d933b6fb43bc7f576336b8f4d7eb5ba12/junit-4.13.2.jar
        jar2: /home/ubuntu/.gradle/wrapper/dists/gradle-8.0-rc-1-all/2p8rgxxewg8l61n1p3vrzr9s8/gradle-8.0-rc-1/lib/junit-4.13.2.jar

github-actions · 2023-01-12T19:05:12Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/9341/
CommitID: 5bd2080
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

github-actions · 2023-01-12T19:44:58Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/9342/
CommitID: 15a9d16
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

github-actions · 2023-01-12T20:29:32Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/9347/
CommitID: 15a9d16

github-actions · 2023-01-17T14:18:16Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/9470/
CommitID: ceee9f0
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

github-actions · 2023-01-17T19:59:24Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/9496/
CommitID: 9df0557
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

github-actions · 2023-01-17T21:17:04Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/9502/
CommitID: 18259d9

github-actions · 2023-01-18T15:12:16Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/9531/
CommitID: ed78a9c
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

github-actions · 2023-02-13T15:37:18Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/11071/
CommitID: d523fd4
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

github-actions · 2023-02-13T16:13:22Z

Gradle Check (Jenkins) Run Completed with:

RESULT: UNSTABLE ❕
TEST FAILURES:

      2 org.opensearch.cluster.service.MasterServiceTests.classMethod
      1 org.opensearch.cluster.service.MasterServiceTests.testThrottlingForMultipleTaskTypes
      1 org.opensearch.action.admin.indices.create.CreateIndexIT.testCreateAndDeleteIndexConcurrently
      1 org.opensearch.action.admin.indices.create.CreateIndexIT.classMethod

URL: https://build.ci.opensearch.org/job/gradle-check/11072/
CommitID: 777bf6b
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

andrross · 2023-02-13T16:54:50Z

build.gradle

@@ -413,6 +427,13 @@ gradle.projectsEvaluated {
    }

    project.tasks.withType(Test) { task ->
+      // This is so hacky: now, by default, test tasks uses JUnit framework and always includes 'junit'


I'm confused about how this comment relates to this code here. The comment has been added but no code has changed?

Oh thanks @andrross , it was initially applied in 2 places, removing that

github-actions · 2023-02-13T17:18:18Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/11076/
CommitID: 50a1994

github-actions · 2023-02-13T17:39:43Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/11077/
CommitID: ca4e44c

github-actions · 2023-02-14T14:31:56Z

Gradle Check (Jenkins) Run Completed with:

RESULT: UNSTABLE ❕
TEST FAILURES:

      1 org.opensearch.indices.replication.SegmentReplicationStatsIT.testSegmentReplicationStatsResponse

URL: https://build.ci.opensearch.org/job/gradle-check/11121/
CommitID: b1d149d
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

reta · 2023-02-16T13:47:02Z

@dblock @andrross mind taking a look folks? thanks!

andrross · 2023-02-16T18:44:13Z

build.gradle

+      //  jar1: /home/ubuntu/.gradle/caches/modules-2/files-2.1/junit/junit/4.13.2/8ac9e16d933b6fb43bc7f576336b8f4d7eb5ba12/junit-4.13.2.jar
+      //  jar2: /home/ubuntu/.gradle/wrapper/dists/gradle-8.0-rc-1-all/2p8rgxxewg8l61n1p3vrzr9s8/gradle-8.0-rc-1/lib/junit-4.13.2.jar
+      // 
+      task.getTestFrameworkProperty().convention(getProviderFactory().provider(() -> new JUnitTestFramework(task, task.getFilter(), false)));


I understand the problem here (gradle includes JUnit by default resulting in a duplicate JAR on the classpath). But how does code solve it? I obviously don't know gradle very well...

But how does code solve it?

You see the last option in the JUnitTestFramework constructor - false - it literally says "do not include the JUnit dependencies" [1]

[1] https://github.com/gradle/gradle/blob/master/subprojects/testing-jvm/src/main/java/org/gradle/api/internal/tasks/testing/junit/JUnitTestFramework.java#L44

Makes sense. Thanks! One of Nick's cryptic booleans :)

Yeah, it was possible to control this behaviour with a property - but not anymore with Gradle 8

andrross · 2023-02-16T18:48:12Z

buildSrc/src/main/java/org/opensearch/gradle/testclusters/StandaloneRestIntegTestTask.java

+                    .invokeExact((BuildServiceProvider<TestClustersThrottle, ?>) throttleProvider);
+            }
+        } catch (Throwable ex) {
+            throw new IllegalStateException("Unable to find suitable BuildServiceRegistryInternal::getResourceLock", ex);


Copy/paste error on "getResourceLock" in exception message?

Ahh.... thanks :)

andrross · 2023-02-16T18:49:02Z

buildSrc/src/main/java/org/opensearch/gradle/testclusters/StandaloneRestIntegTestTask.java

+    ) {
+        try {
+            try {
+                // The forService(Provider) is used by Gradle pre-8.0


When does this code ever need to run against Gradle pre-8.0 after this change?

It will run every time the build will be performed by pre - Gradle 8, best examples - plugins. OpenSearch plugins support is extensively using Gradle plugins, if the plugin uses fe Gradle 7.6 (which at this moment is applicable to any other plugin outside core), the build will fail right away.

Gotcha, thanks!

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

andrross · 2023-02-16T19:08:16Z

@reta Can we backport this to 2.x?

reta · 2023-02-16T19:14:59Z

@reta Can we backport this to 2.x?

Yeah, will do, thanks @andrross ! Should be no issues

github-actions · 2023-02-16T19:34:10Z

Gradle Check (Jenkins) Run Completed with:

RESULT: UNSTABLE ❕
TEST FAILURES:

      1 org.opensearch.cluster.allocation.AwarenessAllocationIT.testThreeZoneOneReplicaWithForceZoneValueAndLoadAwareness

URL: https://build.ci.opensearch.org/job/gradle-check/11230/
CommitID: 5f65b63
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

opensearch-trigger-bot · 2023-02-16T19:53:55Z

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-5666-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7914c0499048793b55aa7d4d2c1156293e7998be
# Push it to GitHub
git push --set-upstream origin backport/backport-5666-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-5666-to-2.x.

Signed-off-by: Andriy Redko <andriy.redko@aiven.io> (cherry picked from commit 7914c04) Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

(cherry picked from commit 7914c04) Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

reta added the skip-changelog label Dec 30, 2022

reta mentioned this pull request Jan 4, 2023

Update nebula-publishing-plugin to 19.2.0 #5702

Closed

reta force-pushed the update.gradle.8 branch from 740a7fd to 0459264 Compare January 6, 2023 15:04

reta force-pushed the update.gradle.8 branch from 0459264 to 63de475 Compare January 9, 2023 17:49

reta force-pushed the update.gradle.8 branch from 63de475 to cb36e3b Compare January 10, 2023 15:45

reta mentioned this pull request Jan 10, 2023

Bump gradle-extra-configurations-plugin from 8.0.0 to 9.0.0 #5759

Closed

reta force-pushed the update.gradle.8 branch from cb36e3b to 8223bf0 Compare January 10, 2023 19:14

reta force-pushed the update.gradle.8 branch from 8223bf0 to 5bd2080 Compare January 12, 2023 18:33

reta force-pushed the update.gradle.8 branch from 5bd2080 to 15a9d16 Compare January 12, 2023 19:16

reta force-pushed the update.gradle.8 branch from 15a9d16 to ceee9f0 Compare January 17, 2023 13:47

reta changed the title ~~Update Gradle to 8.0-rc-1~~ Update Gradle to 8.0-rc-2 Jan 17, 2023

reta force-pushed the update.gradle.8 branch from ceee9f0 to 9df0557 Compare January 17, 2023 19:38

reta force-pushed the update.gradle.8 branch from 9df0557 to 18259d9 Compare January 17, 2023 20:47

reta force-pushed the update.gradle.8 branch from 18259d9 to ed78a9c Compare January 18, 2023 15:08

reta force-pushed the update.gradle.8 branch from ed78a9c to 9f7160f Compare January 18, 2023 15:44

reta force-pushed the update.gradle.8 branch from 777bf6b to 50a1994 Compare February 13, 2023 16:48

andrross reviewed Feb 13, 2023

View reviewed changes

reta force-pushed the update.gradle.8 branch from 50a1994 to ca4e44c Compare February 13, 2023 17:11

reta force-pushed the update.gradle.8 branch from ca4e44c to b1d149d Compare February 14, 2023 14:03

reta requested a review from andrross February 14, 2023 14:03

andrross reviewed Feb 16, 2023

View reviewed changes

Update Gradle to 8.0

5f65b63

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

reta force-pushed the update.gradle.8 branch from b1d149d to 5f65b63 Compare February 16, 2023 19:03

andrross approved these changes Feb 16, 2023

View reviewed changes

andrross added the backport 2.x Backport to 2.x branch label Feb 16, 2023

reta merged commit 7914c04 into opensearch-project:main Feb 16, 2023

reta added a commit to reta/OpenSearch that referenced this pull request Feb 16, 2023

Update Gradle to 8.0 (opensearch-project#5666)

0f30a87

Signed-off-by: Andriy Redko <andriy.redko@aiven.io> (cherry picked from commit 7914c04) Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

reta mentioned this pull request Feb 16, 2023

[Backport] [2.x] Update Gradle to 8.0 (#5666) #6344

Merged

andrross pushed a commit that referenced this pull request Feb 16, 2023

Update Gradle to 8.0 (#5666) (#6344)

c1c26e4

(cherry picked from commit 7914c04) Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

dbwiddis mentioned this pull request Feb 28, 2023

Update dependency gradle to v8 - autoclosed opensearch-project/opensearch-sdk-java#441

Closed

1 task

Yury-Fridlyand mentioned this pull request Mar 3, 2023

[FEATURE] Migrate to Gradle 8 opensearch-project/sql#1392

Open

This was referenced Mar 6, 2023

Upgrade from gradle 7.4.2 to 8.0.2 opensearch-project/common-utils#379

Closed

Update to gradle 8.0.2 opensearch-project/security#2520

Merged

cwperks mentioned this pull request Mar 23, 2023

Update to Gradle 8.0.2 opensearch-project/job-scheduler#348

Merged

5 tasks

mch2 mentioned this pull request May 8, 2023

Manual backport of guava, netty, jetty version bumps in hdfs-fixture to 1.x. #7472

Merged

Update Gradle to 8.0 #5666

Update Gradle to 8.0 #5666

Conversation

reta commented Dec 30, 2022 • edited Loading

Description

Issues Resolved

Check List

github-actions bot commented Dec 30, 2022

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Jan 6, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Jan 9, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Jan 10, 2023

Gradle Check (Jenkins) Run Completed with:

dblock commented Jan 10, 2023 • edited Loading

reta commented Jan 10, 2023

github-actions bot commented Jan 10, 2023

Gradle Check (Jenkins) Run Completed with:

reta commented Jan 11, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Jan 12, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Jan 12, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Jan 12, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Jan 17, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Jan 17, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Jan 17, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Jan 18, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Feb 13, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Feb 13, 2023

Gradle Check (Jenkins) Run Completed with:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Feb 13, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Feb 13, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Feb 14, 2023

Gradle Check (Jenkins) Run Completed with:

reta commented Feb 16, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

reta Feb 16, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andrross commented Feb 16, 2023

reta commented Feb 16, 2023 • edited Loading

github-actions bot commented Feb 16, 2023

Gradle Check (Jenkins) Run Completed with:

opensearch-trigger-bot bot commented Feb 16, 2023

reta commented Dec 30, 2022 •

edited

Loading

dblock commented Jan 10, 2023 •

edited

Loading

reta Feb 16, 2023 •

edited

Loading

reta commented Feb 16, 2023 •

edited

Loading