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

Onboard prod jenkins docker images to github actions #1223

Merged

Conversation

peterzhuamazon
Copy link
Member

Description

Onboard prod jenkins docker images to github actions

Issues Resolved

#1097

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc 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: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
cd ./OpenSearch-Dashboards/
su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm use && node -v && yarn -v &&
cd plugins/dashboards-observability &&
yarn osd bootstrap && yarn test --coverage --maxWorkers=100%"
Copy link
Member

Choose a reason for hiding this comment

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

We shouldn't need yarn osd bootstrap again. If this is done already on line 52.

Copy link
Member Author

Choose a reason for hiding this comment

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

One in OSD folder one in obs folder.
Normally I see doing this in obs folder / plugin folder is enough.
Tho your original code did it in OSD not plugin so it might miss things that is why I add it again, should not harm 😄

Copy link
Collaborator

Choose a reason for hiding this comment

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

In my experience, just the OSD bootstrap has sufficed, not sure I've needed two bootstraps before

Copy link
Member Author

Choose a reason for hiding this comment

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

If bootstrap in plugin folder then yeah one is enough.

Copy link
Member

Choose a reason for hiding this comment

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

doesn't matter where, it's calling the same osd script

@@ -68,14 +138,6 @@ jobs:
cd OpenSearch-Dashboards/plugins/dashboards-observability
yarn test --coverage --maxWorkers=100%

- name: Upload coverage
if: ${{ matrix.os == 'ubuntu-latest' }}
uses: codecov/codecov-action@v1
Copy link
Collaborator

@Swiddis Swiddis Nov 2, 2023

Choose a reason for hiding this comment

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

Is there a particular reason we're removing codecov? Because it was moved to the linux build

@peterzhuamazon peterzhuamazon merged commit e24d6e7 into opensearch-project:main Nov 2, 2023
7 checks passed
@peterzhuamazon peterzhuamazon deleted the issues-1097-1 branch November 2, 2023 16:51
@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:

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

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

@peterzhuamazon
Copy link
Member Author

Will manually backport.

@vamsi-amazon
Copy link
Member

Manually Backported here: #1225
removing backport-failed lable.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x enhancement New feature or request
Projects
Development

Successfully merging this pull request may close these issues.

6 participants