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

fix Jenkins CI pipeline for OS 3.0 version bump #901

Merged
merged 4 commits into from
May 25, 2023

Conversation

b4sjoo
Copy link
Collaborator

@b4sjoo b4sjoo commented May 18, 2023

Description

Jenkins CI workflow on OS 3.0 failed with message:

FAILURE: Build failed with an exception.

* What went wrong:
A problem was found with the configuration of task ':opensearch-ml-client:publishShadowPublicationToStagingRepository' (type 'PublishToMavenRepository').
  - Gradle detected a problem with the following location: 'C:\Users\Administrator\AppData\Local\Temp\tmpypnhpv6j\ml-commons\client\build\libs\opensearch-ml-client-3.0.0.0.jar'.
    
    Reason: Task ':opensearch-ml-client:publishShadowPublicationToStagingRepository' uses this output of task ':opensearch-ml-client:jar' without declaring an explicit or implicit dependency. This can lead to incorrect results being produced, depending on what order the tasks are executed.

https://build.ci.opensearch.org/job/distribution-build-opensearch/7856/console

Issues Resolved

This is a following up fix on #891

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

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.

Signed-off-by: Sicheng Song <sicheng.song@outlook.com>
jngz-es
jngz-es previously approved these changes May 18, 2023
Signed-off-by: Sicheng Song <sicheng.song@outlook.com>
jngz-es
jngz-es previously approved these changes May 18, 2023
Signed-off-by: Sicheng Song <sicheng.song@outlook.com>
@b4sjoo b4sjoo dismissed stale reviews from martin-gaievski and jngz-es via 5f72f2b May 18, 2023 22:13
jngz-es
jngz-es previously approved these changes May 18, 2023
@peterzhuamazon
Copy link
Member

peterzhuamazon commented May 18, 2023

Thanks @b4sjoo can you add a test so that ./gradlew publishAllPublicationsToStagingRepository can be properly tested in github checks?

Signed-off-by: Sicheng Song <sicheng.song@outlook.com>
@b4sjoo b4sjoo dismissed stale reviews from martin-gaievski and jngz-es via d40f88c May 18, 2023 23:35
@b4sjoo
Copy link
Collaborator Author

b4sjoo commented May 18, 2023

Build is failing due to opensearch-project/OpenSearch#7508

@b4sjoo
Copy link
Collaborator Author

b4sjoo commented May 18, 2023

Thanks @b4sjoo can you add a test so that ./gradlew publishAllPublicationsToStagingRepository can be properly tested in github checks?

@peterzhuamazon Sure will do. But for now there are more breaking changes to go. We will add them once we saw a success Jenkin build.

@codecov
Copy link

codecov bot commented May 24, 2023

Codecov Report

Merging #901 (d40f88c) into main (ce6e6c7) will increase coverage by 0.03%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##               main     #901      +/-   ##
============================================
+ Coverage     84.76%   84.80%   +0.03%     
- Complexity     1630     1632       +2     
============================================
  Files           135      135              
  Lines          6079     6079              
  Branches        596      596              
============================================
+ Hits           5153     5155       +2     
+ Misses          668      666       -2     
  Partials        258      258              
Flag Coverage Δ
ml-commons 84.80% <100.00%> (+0.03%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...org/opensearch/ml/cluster/DiscoveryNodeHelper.java 95.23% <ø> (ø)
...ain/java/org/opensearch/ml/task/MLTaskManager.java 68.71% <ø> (ø)
.../java/org/opensearch/ml/utils/RestActionUtils.java 80.39% <ø> (ø)
...java/org/opensearch/ml/utils/MLExceptionUtils.java 86.36% <100.00%> (ø)

... and 1 file with indirect coverage changes

@martin-gaievski
Copy link
Member

@b4sjoo can you please also address call to non-existent method at plugin/src/main/java/org/opensearch/ml/cluster/DiscoveryNodeHelper.java.

Line 41:

excludedNodeNames = Strings.commaDelimitedListToSet(ML_COMMONS_EXCLUDE_NODE_NAMES.get(settings));

but that method got removed from core:

https://github.com/opensearch-project/OpenSearch/blob/main/server/src/main/java/org/opensearch/common/Strings.java

we detected it in neural-search CI, it's failing due to mentioned call:

https://github.com/opensearch-project/neural-search/actions/runs/5073317788/jobs/9112183832#step:4:149

@b4sjoo b4sjoo merged commit dd54ea5 into opensearch-project:main May 25, 2023
@b4sjoo
Copy link
Collaborator Author

b4sjoo commented May 31, 2023

This PR fixed the issue #891 and unblock the Jenkins CI from our side.

@b4sjoo b4sjoo deleted the main_fix branch May 31, 2023 23:21
@acarbonetto
Copy link

acarbonetto commented Jun 30, 2023

@jngz-es @b4sjoo @rbhavna can someone add the backport 2.x label and backport to the 2.x branch please?
opensearch-project/OpenSearch#8316 was recently merged to 2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-901-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 dd54ea59add6004db2afefb676b35daadfe9ac6d
# Push it to GitHub
git push --set-upstream origin backport/backport-901-to-2.x
# Go back to the original working tree
cd ../..
# 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-901-to-2.x.

@b4sjoo
Copy link
Collaborator Author

b4sjoo commented Jun 30, 2023

@acarbonetto #1018 should unblock SQL team. Are you still facing with a CI block?

@b4sjoo
Copy link
Collaborator Author

b4sjoo commented Jun 30, 2023

@jngz-es @b4sjoo @rbhavna can someone add the backport 2.x label and backport to the 2.x branch please? opensearch-project/OpenSearch#8316 was recently merged to 2.x.

This PR is for String package refactoring, not j.u.map migration.

@nknize
Copy link

nknize commented Jun 30, 2023

This PR is for String package refactoring, not j.u.map migration.

Correct. It looks like ml-commons munged the Strings refactor with the removal of ImmutableOpenMap. We can either tease those apart here in the backport, or we can wait for the Strings refactor PR to be backported to core. The quicker I can get a core reviewer to approve those backport PRs the quicker they will merge. Going the former route will fix the build back to green. Going the latter route will keep the build red until the backport PRs are merged.

@b4sjoo
Copy link
Collaborator Author

b4sjoo commented Jul 6, 2023

OK it seems the String refactor backport PR merged. Let's get it fixed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants