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 Observability CI workflow checks #2046

Merged
merged 5 commits into from
Aug 9, 2024

Conversation

ps48
Copy link
Member

@ps48 ps48 commented Aug 7, 2024

Description

  • Add job scheduler to dashboards-observability CI, SQL plugin recently added this as an dependency leading the observability CI failing waiting for Job scheduler plugin. Related upstream PR: [Feature] Flint query scheduler part1 - integrate job scheduler plugin sql#2834

  • Removed datasources tests from observability plugin

  • Update link checker to exclude localhost links

  • Fixed link for getting strated

Issues Resolved

#1886

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: Shenoy Pratik <sgguruda@amazon.com>
@RyanL1997
Copy link
Collaborator

Should we also backport this?

@derek-ho
Copy link
Collaborator

derek-ho commented Aug 8, 2024

@ps48
Copy link
Member Author

ps48 commented Aug 8, 2024

@derek-ho The workflows are still using the old workflow file. I think the workflows will only get updated once merged in.

@derek-ho
Copy link
Collaborator

derek-ho commented Aug 8, 2024

@ps48 it looks like its a different workflow file, I think you need to make the same change in this file: https://github.com/opensearch-project/dashboards-observability/blob/main/.github/workflows/integration-tests-workflow.yml#L56 here

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
@ps48
Copy link
Member Author

ps48 commented Aug 8, 2024

Thanks! @derek-ho that was a good catch, updated the PR

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
@ps48 ps48 changed the title Add job scheduler to observability CI Fix Observability CI workflow checks Aug 8, 2024
@derek-ho derek-ho merged commit 61e6012 into opensearch-project:main Aug 9, 2024
15 of 22 checks passed
@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-2046-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 61e6012bb7aed2611485dbdc460c57e39d68249c
# Push it to GitHub
git push --set-upstream origin backport/backport-2046-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-2046-to-2.x.

ps48 added a commit to ps48/dashboards-observability that referenced this pull request Aug 10, 2024
* add job scheduler to observability CI

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update workflow for integ tests

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* remove datasources test

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* exclude localhost links from link checker

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update links for link checker

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
(cherry picked from commit 61e6012)
ps48 added a commit that referenced this pull request Aug 12, 2024
* add job scheduler to observability CI

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update workflow for integ tests

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* remove datasources test

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* exclude localhost links from link checker

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update links for link checker

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
(cherry picked from commit 61e6012)
TackAdam pushed a commit to TackAdam/dashboards-observability that referenced this pull request Aug 20, 2024
* add job scheduler to observability CI

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update workflow for integ tests

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* remove datasources test

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* exclude localhost links from link checker

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update links for link checker

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
Signed-off-by: Adam Tackett <tackadam@amazon.com>
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.

6 participants