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

Update tenant to global to maps-dashboards #1073

Merged

Conversation

junqiu-lei
Copy link
Member

@junqiu-lei junqiu-lei commented Feb 6, 2024

Description

Update tenant to global to maps-dashboards

Test

arm64-tar-with-security:

       Spec                                              Tests  Passing  Failing  Pending  Skipped  
  ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
  │ ✔  plugins/custom-import-map-dashboard      00:30        1        1        -        -        - │
  │    s/1_import_vector_map_tab.spec.js                                                           │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  plugins/custom-import-map-dashboard      01:49        1        1        -        -        - │
  │    s/2_opensearchMapLayer.spec.js                                                              │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  plugins/custom-import-map-dashboard      01:42        1        1        -        -        - │
  │    s/3_add_saved_object.spec.js                                                                │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  plugins/custom-import-map-dashboard      02:13        2        2        -        -        - │
  │    s/4_documentsLayer.spec.js                                                                  │
  └────────────────────────────────────────────────────────────────────────────────────────────────┘
    ✔  All specs passed!                        06:15        5        5        -        -        -  

Done in 470.67s.

x64-tar-with-security:

       Spec                                              Tests  Passing  Failing  Pending  Skipped  
  ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
  │ ✔  plugins/custom-import-map-dashboard      00:27        1        1        -        -        - │
  │    s/1_import_vector_map_tab.spec.js                                                           │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  plugins/custom-import-map-dashboard      01:43        1        1        -        -        - │
  │    s/2_opensearchMapLayer.spec.js                                                              │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  plugins/custom-import-map-dashboard      01:41        1        1        -        -        - │
  │    s/3_add_saved_object.spec.js                                                                │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  plugins/custom-import-map-dashboard      02:24        2        2        -        -        - │
  │    s/4_documentsLayer.spec.js                                                                  │
  └────────────────────────────────────────────────────────────────────────────────────────────────┘
    ✔  All specs passed!                        06:17        5        5        -        -        -  

Check List

  • 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.

@kavilla
Copy link
Member

kavilla commented Feb 6, 2024

is to circumvent long round trip times of http calls on startup when adding security plugin

@junqiu-lei
Copy link
Member Author

is to circumvent long round trip times of http calls on startup when adding security plugin

@kavilla Yes, the flaky only happened when security enabled.

@junqiu-lei junqiu-lei changed the title Add more timeout and wait to maps-dashboards Update tenant to global to maps-dashboards Feb 7, 2024
@peterzhuamazon peterzhuamazon merged commit 09f9f3e into opensearch-project:2.x Feb 7, 2024
38 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 7, 2024
Signed-off-by: Junqiu Lei <[email protected]>
(cherry picked from commit 09f9f3e)
peterzhuamazon pushed a commit that referenced this pull request Feb 7, 2024
Signed-off-by: Junqiu Lei <[email protected]>
(cherry picked from commit 09f9f3e)

Co-authored-by: Junqiu Lei <[email protected]>
@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-1073-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 09f9f3e15b46ba22396aaa04e8a2989380d587b2
# Push it to GitHub
git push --set-upstream origin backport/backport-1073-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-1073-to-2.x.

@ruanyl
Copy link
Member

ruanyl commented Feb 7, 2024

@junqiu-lei the auto backport failed, could you please do a manual backport?

@junqiu-lei
Copy link
Member Author

@ruanyl this PR targeted to 2.x branch to fix the issue firstly. Once the release 2.12 integ test stable in Jenkins CI, will merge related changes to main.

@opensearch-trigger-bot
Copy link
Contributor

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

Then, create a pull request where the base branch is main and the compare/head branch is backport/backport-1073-to-main.

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.

4 participants