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

[maps-dashboards] Update data source name and rebase code in maps #1147

Merged
merged 1 commit into from
Mar 19, 2024

Conversation

junqiu-lei
Copy link
Member

@junqiu-lei junqiu-lei commented Mar 15, 2024

Description

This PR does:

  1. Update "data source" name from Update data layer source name dashboards-maps#588
  2. Rebase code change from 2.x to main.

Test

Local test:



       Spec                                              Tests  Passing  Failing  Pending  Skipped  
  ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
  │ ✔  plugins/custom-import-map-dashboard      00:51        1        1        -        -        - │
  │    s/1_import_vector_map_tab.spec.js                                                           │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  plugins/custom-import-map-dashboard      01:54        1        1        -        -        - │
  │    s/2_opensearchMapLayer.spec.js                                                              │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  plugins/custom-import-map-dashboard      01:34        1        1        -        -        - │
  │    s/3_add_saved_object.spec.js                                                                │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  plugins/custom-import-map-dashboard      02:55        2        2        -        -        - │
  │    s/4_documentsLayer.spec.js                                                                  │
  └────────────────────────────────────────────────────────────────────────────────────────────────┘
    ✔  All specs passed!                        07:16        5        5        -        -        -  

  • 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: Junqiu Lei <junqiu@amazon.com>
@junqiu-lei
Copy link
Member Author

junqiu-lei commented Mar 15, 2024

All in all, the test passed in my local and looks like failure is due to outdated maps plugin used in the CI.

Looked into the CI failure, looks like the maps UI in cypress CI isn't latest from maps-dashboards main branch. The OSD artifact used in CI come from https://build.ci.opensearch.org/blue/organizations/jenkins/distribution-build-opensearch-dashboards/detail/distribution-build-opensearch-dashboards/7499/pipeline/164, I saw build error message for maps-dashboards and have auto cut issue: opensearch-project/dashboards-maps#596

+ gh issue list --repo https://github.com/opensearch-project/dashboards-maps.git -S '[AUTOCUT] Distribution Build Failed for customImportMapDashboards-3.0.0 in:title' --label autocut,v3.0.0 --json number --jq '.[0].number'

cc: @vibrantvarun @gaiksaya

Copy link
Member

@SuZhou-Joe SuZhou-Joe left a comment

Choose a reason for hiding this comment

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

Would be nice to post your local test result in the PR.

LGTM and approved, let's wait for a up-to-date build candidate to make the flow pass before merging the code.

BTW, any backport label needed? Is it for 2.13?

@junqiu-lei
Copy link
Member Author

junqiu-lei commented Mar 15, 2024

Would be nice to post your local test result in the PR.

LGTM and approved, let's wait for a up-to-date build candidate to make the flow pass before merging the code.

BTW, any backport label needed? Is it for 2.13?

Added local test results on PR description. Yes please help add tag backport 2.x and it's needed for 2.13.

@Hailong-am Hailong-am merged commit 424f59c into opensearch-project:main Mar 19, 2024
43 of 44 checks passed
@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-1147-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 424f59c73b745cca762fa11a43abbc8dc460d562
# Push it to GitHub
git push --set-upstream origin backport/backport-1147-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-1147-to-2.x.

@Hailong-am
Copy link
Collaborator

@junqiu-lei would you mind do manual backport to 2.x?

junqiu-lei added a commit to junqiu-lei/opensearch-dashboards-functional-test that referenced this pull request Mar 19, 2024
…earch-project#1147)

Signed-off-by: Junqiu Lei <junqiu@amazon.com>

(cherry picked from commit 424f59c)
Signed-off-by: Junqiu Lei <junqiu@amazon.com>
@junqiu-lei
Copy link
Member Author

@junqiu-lei would you mind do manual backport to 2.x?

@Hailong-am The backport PR raised out by #1158

Hailong-am pushed a commit that referenced this pull request Mar 19, 2024
#1158)

(cherry picked from commit 424f59c)

Signed-off-by: Junqiu Lei <junqiu@amazon.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Mar 20, 2024
#1158)

(cherry picked from commit 424f59c)

Signed-off-by: Junqiu Lei <junqiu@amazon.com>
(cherry picked from commit 7d33af6)
peterzhuamazon pushed a commit that referenced this pull request Mar 20, 2024
#1158) (#1165)

(cherry picked from commit 424f59c)

Signed-off-by: Junqiu Lei <junqiu@amazon.com>
(cherry picked from commit 7d33af6)

Co-authored-by: Junqiu Lei <junqiu@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.

5 participants