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.

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

Bump nebula-publishing-plugin from v4.4.0 to v4.6.0. #5127

Merged
merged 1 commit into from
Nov 8, 2022

Conversation

mch2
Copy link
Member

@mch2 mch2 commented Nov 8, 2022

Signed-off-by: Marc Handalian [email protected]

Description

Bump nebula-publishing-plugin from v4.4.4 to v4.6.0.
4.4.4 relies on nebula-core 3.0.0 which is not in maven central. v4.6.0 depends on nebula-core 4.0.1 which is present.

Issues Resolved

closes #5121

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.

@mch2 mch2 force-pushed the nebula branch 2 times, most recently from dfc0faa to 836777b Compare November 8, 2022 03:33
@mch2 mch2 marked this pull request as ready for review November 8, 2022 03:33
@mch2 mch2 requested review from a team and reta as code owners November 8, 2022 03:33
@dblock
Copy link
Member

dblock commented Nov 8, 2022

Looks like https://github.com/opensearch-project/OpenSearch/actions/runs/3416141316/jobs/5685981987 still brought in 3.0 :( YOLO all the way to 19?

@mch2
Copy link
Member Author

mch2 commented Nov 8, 2022

* What went wrong:
Could not determine the dependencies of task ':buildSrc:test'.
> Could not determine the dependencies of null.
   > Could not resolve all task dependencies for configuration ':buildSrc:runtimeClasspath'.
      > Could not find com.netflix.nebula:nebula-core:3.0.0.
        Searched in the following locations:
          - https://repo.maven.apache.org/maven2/com/netflix/nebula/nebula-core/3.0.0/nebula-core-3.0.0.pom
          - https://plugins.gradle.org/m2/com/netflix/nebula/nebula-core/3.0.0/nebula-core-3.0.0.pom
        Required by:
            project :buildSrc > com.netflix.nebula:nebula-publishing-plugin:4.4.4

Its as if spotless check is not applying the change. I don't see another reference to 4.4.4.

@mch2
Copy link
Member Author

mch2 commented Nov 8, 2022

I wiped my gradle caches locally and ran spotless and it passes with 4.6.0 - idk that we need to YOLO to 19 right now.

@mch2
Copy link
Member Author

mch2 commented Nov 8, 2022

heh, the workflow is cloning main and running spotless against it...

From https://github.com/opensearch-project/OpenSearch
 * [new ref]         2139e804158c34bceeb581ac01c5b562dc734485 -> origin/main

Determining the checkout info
Checking out the ref
  /usr/bin/git checkout --progress --force -B main refs/remotes/origin/main
  Switched to a new branch 'main'
  branch 'main' set up to track 'origin/main'.
/usr/bin/git log -1 --format='%H'
'2139e804158c34bceeb581ac01c5b562dc734485'
25s
Run ./gradlew spotlessCheck

@peterzhuamazon
Copy link
Member

peterzhuamazon commented Nov 8, 2022

The trigger is PR target thus you need to explicitly state the checkout ref.

ref: ${{ github.event.pull_request.head.sha }}

The spotless and the precommit both using wrong checkout.

This behavior is only happening on pull_request_target and will only take effect when the PR is merged.
Otherwise it will take effect immediately.

Thanks.

@dblock
Copy link
Member

dblock commented Nov 8, 2022

@mch2 the spotless check should change to pull_request, the gradle check runs on target to have token access I imagine - let’s try this here?

@peterzhuamazon
Copy link
Member

A better way to deal with this:

  1. Revert 2139e80
  2. Replace with better dependency in here: https://github.com/opensearch-project/opensearch-dashboards-functional-test/blob/main/.github/workflows/alerting-release-e2e-workflow.yml#L23

@dblock
Copy link
Member

dblock commented Nov 8, 2022

On a second thought it you think the refactoring if that sequence in the GHA is too big, we can punt it. But I’d rather lose the dependency than be running these checks against the wrong ref.

Agree with Peter

@mch2
Copy link
Member Author

mch2 commented Nov 8, 2022

Manually PR'd a revert commit, auto ones fail DCO...

Signed-off-by: Marc Handalian <[email protected]>

Add changelog entry.

Signed-off-by: Marc Handalian <[email protected]>
@github-actions
Copy link
Contributor

github-actions bot commented Nov 8, 2022

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented Nov 8, 2022

Gradle Check (Jenkins) Run Completed with:

  • RESULT: null ❌
  • URL: null
  • CommitID: 2ddc911
    Please examine the workflow log, locate, and copy-paste the failure below, then iterate to green.
    Is the failure a flaky test unrelated to your change?

@peterzhuamazon
Copy link
Member

> Task :distribution:bwc:bugfix:buildBwcLinuxTar

 [2.3.1] FAILURE: Build failed with an exception.
 [2.3.1] 
 [2.3.1] * What went wrong:
 [2.3.1] Could not determine the dependencies of task ':buildSrc:test'.
 [2.3.1] > Could not determine the dependencies of null.
 [2.3.1]    > Could not resolve all task dependencies for configuration ':buildSrc:runtimeClasspath'.
 [2.3.1]       > Could not find com.netflix.nebula:nebula-core:3.0.0.
 [2.3.1]         Searched in the following locations:
 [2.3.1]           - https://repo.maven.apache.org/maven2/com/netflix/nebula/nebula-core/3.0.0/nebula-core-3.0.0.pom
 [2.3.1]           - https://plugins.gradle.org/m2/com/netflix/nebula/nebula-core/3.0.0/nebula-core-3.0.0.pom
 [2.3.1]         Required by:
 [2.3.1]             project :buildSrc > com.netflix.nebula:nebula-publishing-plugin:4.4.4
 [2.3.1] 
 [2.3.1] * Try:
 [2.3.1] > Run with --stacktrace option to get the stack trace.
 [2.3.1] > Run with --info or --debug option to get more log output.
 [2.3.1] 
 [2.3.1] * Get more help at https://help.gradle.org/
 [2.3.1] 
 [2.3.1] BUILD FAILED in 22s
Output for /var/jenkins/workspace/gradle-check/search/distribution/bwc/bugfix/build/bwc/checkout-2.3/gradlew:

Expected failure? Since it is not backported yet.

@github-actions
Copy link
Contributor

github-actions bot commented Nov 8, 2022

Gradle Check (Jenkins) Run Completed with:

@peterzhuamazon
Copy link
Member

Commit runs on Git Reference: 2ddc911126eef5be774173393d896584c20105af which match the latest commit on this PR.

@mch2
Copy link
Member Author

mch2 commented Nov 8, 2022

oof, yeah thats expected, the test tries to clone 2.3.1 and build it which fails bc it doesn't have this commit.

@mch2
Copy link
Member Author

mch2 commented Nov 8, 2022

All branches that we use for bwc (so pretty much everything) will need this change or it won't compile. @dblock Thoughts on YOLOing this all the way down the chain?

@dblock
Copy link
Member

dblock commented Nov 8, 2022

All branches that we use for bwc (so pretty much everything) will need this change or it won't compile. @dblock Thoughts on YOLOing this all the way down the chain?

Yes do it

@mch2 mch2 added backport 1.x backport 2.x Backport to 2.x branch backport 1.3 Backport to 1.3 branch backport 2.3 Backports to 2.3 branch backport 2.4 Backport to 2.4 branch labels Nov 8, 2022
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.4 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.4 2.4
# Navigate to the new working tree
pushd ../.worktrees/backport-2.4
# Create a new branch
git switch --create backport/backport-5127-to-2.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 166ded0ea529ca1a67ab9f783a18fd077797d841
# Push it to GitHub
git push --set-upstream origin backport/backport-5127-to-2.4
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.4

Then, create a pull request where the base branch is 2.4 and the compare/head branch is backport/backport-5127-to-2.4.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 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-1.3 1.3
# Navigate to the new working tree
pushd ../.worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-5127-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 166ded0ea529ca1a67ab9f783a18fd077797d841
# Push it to GitHub
git push --set-upstream origin backport/backport-5127-to-1.3
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-1.3

Then, create a pull request where the base branch is 1.3 and the compare/head branch is backport/backport-5127-to-1.3.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.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-1.x 1.x
# Navigate to the new working tree
pushd ../.worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-5127-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 166ded0ea529ca1a67ab9f783a18fd077797d841
# Push it to GitHub
git push --set-upstream origin backport/backport-5127-to-1.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-1.x

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.3 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.3 2.3
# Navigate to the new working tree
pushd ../.worktrees/backport-2.3
# Create a new branch
git switch --create backport/backport-5127-to-2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 166ded0ea529ca1a67ab9f783a18fd077797d841
# Push it to GitHub
git push --set-upstream origin backport/backport-5127-to-2.3
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.3

Then, create a pull request where the base branch is 2.3 and the compare/head branch is backport/backport-5127-to-2.3.

@opensearch-trigger-bot
Copy link
Contributor

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-5127-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 166ded0ea529ca1a67ab9f783a18fd077797d841
# Push it to GitHub
git push --set-upstream origin backport/backport-5127-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-5127-to-2.x.

peterzhuamazon pushed a commit to peterzhuamazon/OpenSearch that referenced this pull request Nov 8, 2022
…ect#5127)

Signed-off-by: Marc Handalian <[email protected]>

Add changelog entry.

Signed-off-by: Marc Handalian <[email protected]>

Signed-off-by: Marc Handalian <[email protected]>
mch2 added a commit to mch2/OpenSearch that referenced this pull request Nov 8, 2022
…ect#5127)

Signed-off-by: Marc Handalian <[email protected]>

Add changelog entry.

Signed-off-by: Marc Handalian <[email protected]>

Signed-off-by: Marc Handalian <[email protected]>
(cherry picked from commit 166ded0)
dblock pushed a commit that referenced this pull request Nov 8, 2022
Signed-off-by: Marc Handalian <[email protected]>

Add changelog entry.

Signed-off-by: Marc Handalian <[email protected]>

Signed-off-by: Marc Handalian <[email protected]>

Signed-off-by: Marc Handalian <[email protected]>
Co-authored-by: Marc Handalian <[email protected]>
@peterzhuamazon
Copy link
Member

Hi @mch2 Still need 1.x, 2.x, 1.3, 2.3.

Thanks

@github-actions
Copy link
Contributor

github-actions bot commented Nov 8, 2022

Gradle Check (Jenkins) Run Completed with:

mch2 added a commit to mch2/OpenSearch that referenced this pull request Nov 8, 2022
…ect#5127)

Signed-off-by: Marc Handalian <[email protected]>

Add changelog entry.

Signed-off-by: Marc Handalian <[email protected]>

Signed-off-by: Marc Handalian <[email protected]>
(cherry picked from commit 166ded0)
Signed-off-by: Marc Handalian <[email protected]>
mch2 added a commit to mch2/OpenSearch that referenced this pull request Nov 8, 2022
…ect#5127)

Signed-off-by: Marc Handalian <[email protected]>

Add changelog entry.

Signed-off-by: Marc Handalian <[email protected]>

Signed-off-by: Marc Handalian <[email protected]>
(cherry picked from commit 166ded0)
mch2 added a commit to mch2/OpenSearch that referenced this pull request Nov 8, 2022
…ect#5127)

Signed-off-by: Marc Handalian <[email protected]>

Add changelog entry.

Signed-off-by: Marc Handalian <[email protected]>

Signed-off-by: Marc Handalian <[email protected]>
(cherry picked from commit 166ded0)
mch2 added a commit to mch2/OpenSearch that referenced this pull request Nov 8, 2022
…ect#5127)

Signed-off-by: Marc Handalian <[email protected]>

Add changelog entry.

Signed-off-by: Marc Handalian <[email protected]>

Signed-off-by: Marc Handalian <[email protected]>
(cherry picked from commit 166ded0)
Signed-off-by: Marc Handalian <[email protected]>
@mch2
Copy link
Member Author

mch2 commented Nov 8, 2022

Opened manual backports for:
2.x: #5133
1.3: #5134
1.x: #5135

@github-actions
Copy link
Contributor

github-actions bot commented Nov 8, 2022

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented Nov 8, 2022

Gradle Check (Jenkins) Run Completed with:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x backport 1.3 Backport to 1.3 branch backport 2.x Backport to 2.x branch backport 2.3 Backports to 2.3 branch backport 2.4 Backport to 2.4 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Plugin Build Fails Due to missing nebula Dependencies.
4 participants