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 support to run build on Container image used by release pipeline #1249

Merged
merged 9 commits into from
Oct 17, 2023

Conversation

monusingh-1
Copy link
Collaborator

@monusingh-1 monusingh-1 commented Oct 11, 2023

Description

CI to run on top of the Build Docker Images from production distribution pipeline.

Issues Resolved

#1228

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: monusingh-1 <msnghgw@amazon.com>
@codecov
Copy link

codecov bot commented Oct 11, 2023

Codecov Report

Merging #1249 (8f1395d) into main (633ef8b) will decrease coverage by 28.59%.
Report is 1 commits behind head on main.
The diff coverage is n/a.

❗ Current head 8f1395d differs from pull request most recent head 121b469. Consider uploading reports for the commit 121b469 to get more accurate results

@@              Coverage Diff              @@
##               main    #1249       +/-   ##
=============================================
- Coverage     74.75%   46.17%   -28.59%     
+ Complexity     1024      623      -401     
=============================================
  Files           141      141               
  Lines          4762     4762               
  Branches        521      521               
=============================================
- Hits           3560     2199     -1361     
- Misses          868     2301     +1433     
+ Partials        334      262       -72     

see 82 files with indirect coverage changes

@monusingh-1 monusingh-1 changed the title Container image Add support to run build on Container image used by release pipeline Oct 12, 2023
.github/workflows/build.yml Outdated Show resolved Hide resolved
.github/workflows/build.yml Outdated Show resolved Hide resolved
.github/workflows/build.yml Outdated Show resolved Hide resolved
Signed-off-by: monusingh-1 <msnghgw@amazon.com>
Signed-off-by: monusingh-1 <msnghgw@amazon.com>
Signed-off-by: monusingh-1 <msnghgw@amazon.com>
@peterzhuamazon
Copy link
Member

Hi @ankitkala @monusingh-1 I am adding some changes directly to this PR.
Since we have a even better approach right now.

Will commit soon.

Thanks

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon
Copy link
Member

peterzhuamazon commented Oct 13, 2023

Ready for review.

@ankitkala @monusingh-1

Thanks!


name: Build and Test CCR Plugin on Linux
runs-on: ubuntu-latest
needs: Get-CI-Image-Tag
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if we're adding any value by this extra workflow Build on ubuntu with ci image. We're already testing the same under build-and-test. This one can be removed.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed

Signed-off-by: monusingh-1 <msnghgw@amazon.com>
Signed-off-by: monusingh-1 <msnghgw@amazon.com>
@monusingh-1 monusingh-1 merged commit 0bd703b into opensearch-project:main Oct 17, 2023
12 of 13 checks passed
@opensearch-trigger-bot
Copy link

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

@monusingh-1 monusingh-1 deleted the container_workflow branch October 17, 2023 14:07
@peterzhuamazon
Copy link
Member

Hi @ankitkala @monusingh-1 thanks for merging.
Can we manually backport this to 2.x?

Thanks!

monusingh-1 added a commit to monusingh-1/ccr-dev that referenced this pull request Oct 18, 2023
Signed-off-by: monusingh-1 <msnghgw@amazon.com>
monusingh-1 added a commit that referenced this pull request Oct 18, 2023
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.

[Campaign] Ensure Github workflow runs on docker image used by Production Distribution Build
4 participants