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

Add groupId value propagation tests for ZIP publication task #4772

Merged
merged 1 commit into from
Oct 19, 2022

Conversation

lukas-vlcek
Copy link
Contributor

@lukas-vlcek lukas-vlcek commented Oct 13, 2022

Description

The groupId can be defined on several levels. This commit adds more tests to cover the "edge" cases.

  • In one case the groupId is inherited from the top most allprojects section (and thus can be missing in the publications section).
  • The other case is opposite, it tests that if the groupId is defined on several levels then the most internal level outweighs the other levels.

Issues Resolved

Closes: #4771

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.

Signed-off-by: Lukáš Vlček lukas.vlcek@aiven.io

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@reta reta added the backport 2.x Backport to 2.x branch label Oct 13, 2022
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@lukas-vlcek
Copy link
Contributor Author

Hmm... Flaky tests again? (Timing out...)

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov-commenter
Copy link

Codecov Report

Merging #4772 (505a1fa) into main (d15795a) will increase coverage by 0.06%.
The diff coverage is 44.26%.

@@             Coverage Diff              @@
##               main    #4772      +/-   ##
============================================
+ Coverage     70.66%   70.72%   +0.06%     
- Complexity    57578    57636      +58     
============================================
  Files          4661     4669       +8     
  Lines        276662   276863     +201     
  Branches      40325    40346      +21     
============================================
+ Hits         195501   195821     +320     
+ Misses        64926    64713     -213     
- Partials      16235    16329      +94     
Impacted Files Coverage Δ
.../delete/DeleteDecommissionStateRequestBuilder.java 0.00% <0.00%> (ø)
...apshots/restore/RestoreSnapshotRequestBuilder.java 15.78% <0.00%> (-0.88%) ⬇️
.../org/opensearch/client/support/AbstractClient.java 32.85% <0.00%> (-0.08%) ⬇️
.../java/org/opensearch/common/util/FeatureFlags.java 50.00% <ø> (ø)
...ateway/TransportNodesListGatewayStartedShards.java 51.00% <0.00%> (-0.68%) ⬇️
...h/index/shard/RemoveCorruptedShardDataCommand.java 81.51% <ø> (ø)
...java/org/opensearch/index/shard/StoreRecovery.java 67.88% <ø> (+0.01%) ⬆️
...h/index/store/InMemoryRemoteSnapshotDirectory.java 0.00% <0.00%> (ø)
...in/java/org/opensearch/indices/IndicesService.java 69.65% <0.00%> (-0.25%) ⬇️
...ster/snapshots/restore/RestoreSnapshotRequest.java 64.10% <22.58%> (-5.51%) ⬇️
... and 498 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

The groupId can be defined on several levels. This commit adds more tests to cover the "edge" cases.

- In one case the groupId is inherited from the top most 'allprojects' section (and thus can be missing in the publications section).
- The other case is opposite, it tests that if the groupId is defined on several levels then the most internal level outweighs the other levels.

Closes: opensearch-project#4771

Signed-off-by: Lukáš Vlček <lukas.vlcek@aiven.io>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@reta reta merged commit eb33015 into opensearch-project:main Oct 19, 2022
@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-4772-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 eb3301554ec7e1a07866508ffc390b8651dc3394
# Push it to GitHub
git push --set-upstream origin backport/backport-4772-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-4772-to-2.x.

@lukas-vlcek lukas-vlcek deleted the morePublishTests branch October 19, 2022 17:56
@lukas-vlcek lukas-vlcek restored the morePublishTests branch October 19, 2022 18:02
lukas-vlcek added a commit to lukas-vlcek/OpenSearch that referenced this pull request Oct 20, 2022
This is back-port of opensearch-project#4772

Signed-off-by: Lukáš Vlček <lukas.vlcek@aiven.io>
(cherry picked from commit eb33015)
@lukas-vlcek
Copy link
Contributor Author

I fixed the back-port PR manually (Resolved conflicts) and prepared a new PR here #4848

I do not think I can do

git push --set-upstream origin backport/backport-4772-to-2.x

so I did

git push --set-upstream <my-clone> backport/backport-4772-to-2.x

lukas-vlcek added a commit to lukas-vlcek/OpenSearch that referenced this pull request Oct 20, 2022
This is back-port of opensearch-project#4772

Signed-off-by: Lukáš Vlček <lukas.vlcek@aiven.io>
(cherry picked from commit eb33015)
@lukas-vlcek lukas-vlcek deleted the morePublishTests branch October 20, 2022 14:02
lukas-vlcek added a commit to lukas-vlcek/OpenSearch that referenced this pull request Oct 21, 2022
This is back-port of opensearch-project#4772

Signed-off-by: Lukáš Vlček <lukas.vlcek@aiven.io>
(cherry picked from commit eb33015)
reta pushed a commit that referenced this pull request Oct 21, 2022
This is back-port of #4772

Signed-off-by: Lukáš Vlček <lukas.vlcek@aiven.io>
(cherry picked from commit eb33015)
ashking94 pushed a commit to ashking94/OpenSearch that referenced this pull request Nov 7, 2022
…rch-project#4772)

The groupId can be defined on several levels. This commit adds more tests to cover the "edge" cases.

- In one case the groupId is inherited from the top most 'allprojects' section (and thus can be missing in the publications section).
- The other case is opposite, it tests that if the groupId is defined on several levels then the most internal level outweighs the other levels.

Closes: opensearch-project#4771

Signed-off-by: Lukáš Vlček <lukas.vlcek@aiven.io>

Signed-off-by: Lukáš Vlček <lukas.vlcek@aiven.io>
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.

Add groupId value propagation tests for ZIP publication task
4 participants