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.

Sign up for GitHub

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

Enable knn windows on 2.4.0 and add OSD/reportsDash changes #2812

Merged
merged 1 commit into from
Oct 27, 2022
Merged

Enable knn windows on 2.4.0 and add OSD/reportsDash changes #2812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions manifests/2.4.0/opensearch-2.4.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ components:
ref: '2.x'
platforms:
- linux
- windows
checks:
- gradle:properties:version
- gradle:dependencies:opensearch.version
Expand All @@ -97,6 +98,7 @@ components:
ref: '2.x'
platforms:
- linux
- windows
checks:
- gradle:properties:version
- gradle:dependencies:opensearch.version
Expand Down
12 changes: 4 additions & 8 deletions scripts/components/OpenSearch-Dashboards/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,11 @@ case $PLATFORM-$DISTRIBUTION-$ARCHITECTURE in
;;
esac

echo "Setting node version"

if [ "$PLATFORM" != "windows" ]; then
source $NVM_DIR/nvm.sh
nvm use
else
volta install node@`cat .nvmrc`
volta install yarn
NVM_CMD="source $NVM_DIR/nvm.sh && nvm use"
if [ "$PLATFORM" = "windows" ]; then
NVM_CMD="volta install node@`cat .nvmrc` && volta install yarn"
fi
eval $NVM_CMD

echo "Building node modules for core with $PLATFORM-$DISTRIBUTION-$ARCHITECTURE"
yarn osd bootstrap
Expand Down
12 changes: 10 additions & 2 deletions scripts/components/reportsDashboards/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ case $PLATFORM in
linux*)
PLATFORM="linux"
;;
windows*|*nt*)
PLATFORM="windows"
;;
*)
echo "Unsupported platform: $PLATFORM"
exit 1
Expand All @@ -89,6 +92,11 @@ case $ARCHITECTURE in
;;
esac

NVM_CMD="source $NVM_DIR/nvm.sh && nvm use"
if [ "$PLATFORM" = "windows" ]; then
NVM_CMD="volta install node@`cat ../../OpenSearch-Dashboards/.nvmrc` && volta install yarn"
fi

CHROMIUM_URL="https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/$CHROMIUM_TARGET"

MINOR_VERSION=${VERSION%.*}
Expand All @@ -103,9 +111,9 @@ PLUGIN_NAME=$(basename $(dirname "$PWD"))
# This makes it so there is a dependency on having Dashboards pulled already.
cp -r ../$PLUGIN_FOLDER/ ../../OpenSearch-Dashboards/plugins
echo "BUILD MODULES FOR $PLUGIN_NAME"
(cd ../../OpenSearch-Dashboards && source $NVM_DIR/nvm.sh && nvm use && yarn osd bootstrap)
(cd ../../OpenSearch-Dashboards && eval $NVM_CMD && yarn osd bootstrap)
echo "BUILD RELEASE ZIP FOR $PLUGIN_NAME"
(cd ../../OpenSearch-Dashboards && source $NVM_DIR/nvm.sh && nvm use && cd plugins/$PLUGIN_FOLDER && yarn plugin_helpers build --opensearch-dashboards-version=$VERSION$QUALIFIER_IDENTIFIER)
(cd ../../OpenSearch-Dashboards && eval $NVM_CMD && cd plugins/$PLUGIN_FOLDER && yarn plugin_helpers build --opensearch-dashboards-version=$VERSION$QUALIFIER_IDENTIFIER)
ZIP_NAME=`ls ../../OpenSearch-Dashboards/plugins/$PLUGIN_FOLDER/build | grep .zip`
unzip ../../OpenSearch-Dashboards/plugins/$PLUGIN_FOLDER/build/$ZIP_NAME -d ../../OpenSearch-Dashboards/plugins/$PLUGIN_FOLDER/build/
# Reporting uses headless chromium to generate reports, which needs to be included in its artifact
Expand Down