Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
zelinh committed Jul 9, 2024
2 parents c8c1f08 + b976307 commit 8cdc705
Show file tree
Hide file tree
Showing 155 changed files with 6,433 additions and 1,602 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @dblock @peterzhuamazon @bbarani @gaiksaya @rishabh6788 @zelinh @jordarlu @prudhvigodithi @Divyaasm @tianleh
* @dblock @peterzhuamazon @gaiksaya @rishabh6788 @zelinh @prudhvigodithi @Divyaasm @tianleh
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/plugin_onboarding_template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ body:
- type: markdown
attributes:
value: |
Thanks for taking the time to submit on-boarding request!
Thanks for taking the time to submit on-boarding request! Please note that the estimate time for on-barding a plugin to the distribution is 2 weeks from the time of the request.
- type: textarea
attributes:
description: 'Provide the name of your plugin.'
Expand Down
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/release_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,14 @@ Release blog is ready | :red_circle: | |
### [Preparation](https://github.com/opensearch-project/opensearch-build/wiki/Releasing-the-Distribution#preparation)

- [ ] [Release manager](https://github.com/opensearch-project/opensearch-build/wiki/Releasing-the-Distribution#release-manager) assigned.
- [ ] Update [release page](https://opensearch.org/releases.html) on the website with release manager and release issue details. [Sample PR](https://github.com/opensearch-project/project-website/pull/2642)
- [ ] Existence of label in each component repo. For more information check the [release-label](https://github.com/opensearch-project/opensearch-build/wiki/Releasing-the-Distribution#release-label) section.
- [ ] [Increase the build frequency](https://github.com/opensearch-project/opensearch-build/wiki/Releasing-the-Distribution#increase-the-build-frequency).
- [ ] [Release Issue](https://github.com/opensearch-project/opensearch-build/wiki/Releasing-the-Distribution#release-issue).

### [Campaigns](https://github.com/opensearch-project/opensearch-build/wiki/Releasing-the-Distribution#campaigns)

- [ ] [Component Release Issue](https://github.com/opensearch-project/opensearch-build/wiki/Releasing-the-Distribution#component-release-issue).
- [ ] [Component Release Issue](https://github.com/opensearch-project/opensearch-build/wiki/Releasing-the-Distribution#component-release-issues).
- [ ] [Release Campaigns](https://github.com/opensearch-project/opensearch-build/wiki/Releasing-the-Distribution#release-campaigns).

### [Release Branch and Version Increment](https://github.com/opensearch-project/opensearch-build/wiki/Releasing-the-Distribution#release-branch-readiness) - _Ends __REPLACE_RELEASE-minus-4-days__
Expand Down Expand Up @@ -184,4 +185,4 @@ __Replace with links to all component tracking issues.__
| :red_circle: | Missed multiple milestones |

</p>
</details>
</details>
2 changes: 0 additions & 2 deletions .github/workflows/automatic-merges.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,9 @@ jobs:
dependabot
opensearch-trigger-bot
peterzhuamazon
bbarani
gaiksaya
rishabh6788
zelinh
jordarlu
prudhvigodithi
Divyaasm
dblock
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/get-ci-image-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
TYPE=${{ inputs.type }}
if [[ -z "$PLATFORM" ]]; then
if [[ "$PRODUCT" = "opensearch" ]]; then
PLATFORM="centos7" # Temp measure before centos7 deprecation on opensearch for k-NN
PLATFORM="al2" # Temp measure before al2 deprecation on opensearch for k-NN
else
PLATFORM="almalinux8"
fi
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/os-increment-plugin-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,8 @@ jobs:
- '1.3'
- 2.x
- main
- '2.12'
- '2.13'
- '2.14'
- '2.15'
- '2.16'
exclude:
- {entry: {repo: geospatial}, branch: '1.3'}
- {entry: {repo: neural-search}, branch: '1.3'}
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/osd-increment-plugin-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@ jobs:
- '1.3'
- 2.x
- main
- '2.12'
- '2.13'
- '2.14'
- '2.15'
- '2.16'
steps:
- name: Check out OpenSearch Dashboards repo
uses: actions/checkout@v3
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/python-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ jobs:
python-tests-linux:
needs: Get-CI-Image-Tag
runs-on: ubuntu-latest
env:
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
container:
# using the same image which is used by opensearch-build team to build the OpenSearch Distribution
# this image tag is subject to change as more dependencies and updates will arrive over time
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yaml-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
yaml-lint:
runs-on: ubuntu-latest
env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: 3.9.12
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ env.PYTHON_VERSION }}
Expand Down
6 changes: 3 additions & 3 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- [Overview](#overview)
- [Current Maintainers](#current-maintainers)
- [Emeritus Maintainers](#Emeritus-maintainers)
- [Emeritus Maintainers](#emeritus-maintainers)
- [Release Owner](#release-owner)
- [Release Activities](#release-activities)
- [Dealing with Ambiguity](#dealing-with-ambiguity)
Expand All @@ -18,11 +18,9 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
| Maintainer | GitHub ID | Affiliation |
| ---------------- |------------------------------------------| ----------- |
| Peter Zhu | [peterzhuamazon](https://github.com/peterzhuamazon) | Amazon |
| Barani Bikshandi | [bbarani](https://github.com/bbarani) | Amazon |
| Sayali Gaikawad | [gaiksaya](https://github.com/gaiksaya) | Amazon |
| Rishab Singh | [rishabh6788](https://github.com/rishabh6788) | Amazon |
| Zelin Hao | [zelinh](https://github.com/zelinh) | Amazon |
| Jeff Lu | [jordarlu](https://github.com/jordarlu) | Amazon |
| Prudhvi Godithi | [prudhvigodithi](https://github.com/prudhvigodithi) | Amazon |
| Divya Madala | [Divyaasm](https://github.com/Divyaasm) | Amazon |
| Daniel (dB.) Doubrovkine | [dblock](https://github.com/dblock) | Amazon |
Expand All @@ -36,6 +34,8 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
| Cameron Skinner | [camerski](https://github.com/camerski) | Amazon |
| Marc Handalian | [mch2](https://github.com/mch2) | Amazon |
| Peter Nied | [peternied](https://github.com/peternied) | Amazon |
| Jeff Lu | [jordarlu](https://github.com/jordarlu) | Amazon |
| Barani Bikshandi | [bbarani](https://github.com/bbarani) | Amazon |

## Release Owner

Expand Down
2 changes: 1 addition & 1 deletion ONBOARDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

## Plugin Onboarding

This document describes the steps required to onboard a new plugin to the release workflow for continuous integration and testing. Make sure that you also consider whether the plugin requires documentation to implement or use it. If so, see [Contributing.md](https://github.com/opensearch-project/documentation-website/blob/main/CONTRIBUTING.md) in the documentation-website GitHub repository.
This document describes the steps required to onboard a new plugin to the release workflow for continuous integration and testing. **Please note that the estimate time for on-barding a plugin to the distribution is 2 weeks from the time of the request.** Make sure that you also consider whether the plugin requires documentation to implement or use it. If so, see [Contributing.md](https://github.com/opensearch-project/documentation-website/blob/main/CONTRIBUTING.md) in the documentation-website GitHub repository.

### Onboard to OpenSearch Meta

Expand Down
3 changes: 2 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,13 @@ yamlfix = "~=1.0.1"
yamllint = "~=1.27.1"
pytablewriter = "~=0.64.2"
typed-ast = "~=1.5.4"
zipp = "~=3.8.1"
zipp = "~=3.19.1"
importlib-metadata = "~=4.12.0"
ruamel-yaml = "~=0.17.21"
markdownify = "~=0.12.1"
mistune = "~=3.0.1"
semver = ">=3,<4"
pandas = "~=2.2.2"

[dev-packages]

Expand Down
Loading

0 comments on commit 8cdc705

Please sign in to comment.