Skip to content

Remove Pom task dependenices rewrite#4178

Merged
cwperks merged 1 commit intoopensearch-project:mainfrom
peternied:fix-distribution-build-break
Mar 27, 2024
Merged

Remove Pom task dependenices rewrite#4178
cwperks merged 1 commit intoopensearch-project:mainfrom
peternied:fix-distribution-build-break

Conversation

@peternied
Copy link
Copy Markdown
Member

Description

The underlying issue associated with Pom validation was fixed in OpenSearch [1], this causes the 'hack' that was used to unblock pom generation in security to start causing problems in the distribution builds.

Issues Resolved

Testing

Added new CI test that executes the same job used by the distribution build and checks the expected artifacts exist

Check List

  • New functionality includes testing
  • New functionality has been documented
  • 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.

The underlying issue associated with Pom validation was fixed in OpenSearch [1], this causes the 'hack' that was used to unblock pom generation in security to start causing problems in the distribution builds.

- [1] opensearch-project/OpenSearch#12807

Signed-off-by: Peter Nied <peternied@hotmail.com>
@peternied peternied force-pushed the fix-distribution-build-break branch from c67e6d4 to a11f30e Compare March 27, 2024 12:45
@codecov
Copy link
Copy Markdown

codecov bot commented Mar 27, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 65.93%. Comparing base (551d026) to head (c67e6d4).

❗ Current head c67e6d4 differs from pull request most recent head a11f30e. Consider uploading reports for the commit a11f30e to get more accurate results

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4178      +/-   ##
==========================================
+ Coverage   65.90%   65.93%   +0.02%     
==========================================
  Files         298      298              
  Lines       21425    21425              
  Branches     3475     3475              
==========================================
+ Hits        14121    14126       +5     
+ Misses       5563     5557       -6     
- Partials     1741     1742       +1     

see 1 file with indirect coverage changes

@cwperks cwperks merged commit dc8bd61 into opensearch-project:main Mar 27, 2024
@cwperks
Copy link
Copy Markdown
Member

cwperks commented Mar 27, 2024

@peternied Does this need to be backported?

@peternied peternied deleted the fix-distribution-build-break branch March 27, 2024 14:46
@opensearch-trigger-bot
Copy link
Copy Markdown
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:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-4178-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 dc8bd61a8df01b32805ddde0b6f6c6010eeca5cf
# Push it to GitHub
git push --set-upstream origin backport/backport-4178-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.x

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

peternied added a commit to peternied/security that referenced this pull request Mar 28, 2024
Backport dc8bd61 from opensearch-project#4178

Signed-off-by: Peter Nied <peternied@hotmail.com>
(cherry picked from commit dc8bd61)
peternied added a commit to peternied/security that referenced this pull request Mar 28, 2024
Backport dc8bd61 from opensearch-project#4178

Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Peter Nied <peternied@hotmail.com>
(cherry picked from commit dc8bd61)
dlin2028 pushed a commit to dlin2028/security that referenced this pull request May 1, 2024
### Description
The underlying issue associated with Pom validation was fixed in
OpenSearch [1], this causes the 'hack' that was used to unblock pom
generation in security to start causing problems in the distribution
builds.

- [1] opensearch-project/OpenSearch#12807

### Issues Resolved
- Fixes opensearch-project#4160

### Testing
Added new CI test that executes the same job used by the distribution
build and checks the expected artifacts exist

### Check List
- [X] New functionality includes testing
- [ ] ~New functionality has been documented~
- [X] 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](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).

Signed-off-by: Peter Nied <peternied@hotmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[AUTOCUT] Distribution Build Failed for security-3.0.0

5 participants