Merge pull request opensearch-project#14 from opensearch-project/note…

…books-beta1 Update To Beta1 for OpenSearch Release
joshuali925 · Apr 27, 2021 · 0752a6b · 0752a6b
2 parents 3d63263 + c48716a
commit 0752a6b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 18 deletions.
diff --git a/.github/workflows/dashboards-notebooks-release-workflow.yml b/.github/workflows/dashboards-notebooks-release-workflow.yml
@@ -8,7 +8,8 @@ on:
 
 env:
   PLUGIN_NAME: notebooksDashboards
-  OD_VERSION: 1.0.0.0
+  OPENSEARCH_VERSION: 1.0.0-beta1
+  OPENSEARCH_PLUGIN_VERSION: 1.0.0.0-beta1
 
 jobs:
 
@@ -32,7 +33,7 @@ jobs:
         uses: actions/checkout@v1
         with:
           repository: opensearch-project/Opensearch-Dashboards
-          ref: main
+          ref: ${{ env.OPENSEARCH_VERSION }}
           path: dashboards-notebooks/OpenSearch-Dashboards
 
       - name: Setup Node
@@ -52,7 +53,7 @@ jobs:
         run: |
           cd OpenSearch-Dashboards/plugins/notebooks
           yarn build
-          mv ./build/*.zip ./build/${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}.zip
+          mv ./build/*.zip ./build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip
 
       - name: Upload to S3
         run: |

diff --git a/.github/workflows/dashboards-notebooks-test-and-build-workflow.yml b/.github/workflows/dashboards-notebooks-test-and-build-workflow.yml
@@ -5,7 +5,8 @@ on: [pull_request, push]
 
 env:
   PLUGIN_NAME: notebooksDashboards
-  OD_VERSION: 1.0.0.0
+  OPENSEARCH_VERSION: 1.0.0-beta1
+  OPENSEARCH_PLUGIN_VERSION: 1.0.0.0-beta1
 
 jobs:
 
@@ -21,7 +22,7 @@ jobs:
         uses: actions/checkout@v1
         with:
           repository: opensearch-project/Opensearch-Dashboards
-          ref: main
+          ref: ${{ env.OPENSEARCH_VERSION }}
           path: dashboards-notebooks/OpenSearch-Dashboards
 
       - name: Setup Node
@@ -41,7 +42,7 @@ jobs:
         run: |
           cd OpenSearch-Dashboards/plugins/dashboards-notebooks
           yarn build
-          mv ./build/*.zip ./build/${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}.zip
+          mv ./build/*.zip ./build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v1

diff --git a/.github/workflows/opensearch-notebooks-test-and-build-workflow.yml b/.github/workflows/opensearch-notebooks-test-and-build-workflow.yml
@@ -20,26 +20,26 @@ jobs:
         with:
           repository: 'opensearch-project/OpenSearch'
           path: OpenSearch
-          ref: '1.0.0-alpha2'
+          ref: '1.0.0-beta1'
       - name: Build OpenSearch
         working-directory: ./OpenSearch
-        run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=alpha2 -Dbuild.snapshot=false
+        run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=beta1 -Dbuild.snapshot=false
 
       # dependencies: common-utils
       - name: Checkout common-utils
         uses: actions/checkout@v2
         with:
-          ref: '1.0.0-alpha2'
+          ref: '1.0.0-beta1'
           repository: 'opensearch-project/common-utils'
           path: common-utils
       - name: Build common-utils
         working-directory: ./common-utils
-        run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-alpha2
+        run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-beta1
 
       - name: Build with Gradle
         run: |
           cd opensearch-notebooks
-          ./gradlew build -Dopensearch.version=1.0.0-alpha2
+          ./gradlew build -Dopensearch.version=1.0.0-beta1
 
       - name: Create Artifact Path
         run: |

diff --git a/dashboards-notebooks/opensearch_dashboards.json b/dashboards-notebooks/opensearch_dashboards.json
@@ -1,7 +1,7 @@
 {
   "id": "notebooksDashboards",
-  "version": "1.0.0.0",
-  "opensearchDashboardsVersion": "1.0.0",
+  "version": "1.0.0.0-beta1",
+  "opensearchDashboardsVersion": "1.0.0-beta1",
   "server": true,
   "ui": true,
   "requiredPlugins": ["navigation", "embeddable", "dashboard"],

diff --git a/dashboards-notebooks/package.json b/dashboards-notebooks/package.json
@@ -1,12 +1,12 @@
 {
   "name": "notebooks-dashboards",
-  "version": "1.0.0.0",
+  "version": "1.0.0.0-beta1",
   "description": "OpenSearch Dashboards Notebooks",
   "main": "index.ts",
   "license": "Apache-2.0",
   "opensearchDashboards": {
-    "version": "1.0.0",
-    "templateVersion": "1.0.0"
+    "version": "1.0.0-beta1",
+    "templateVersion": "1.0.0-beta1"
   },
   "scripts": {
     "osd": "node ../../scripts/osd",

diff --git a/opensearch-notebooks/build.gradle b/opensearch-notebooks/build.gradle
@@ -29,7 +29,7 @@ import java.util.concurrent.Callable
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "1.0.0-alpha2")
+        opensearch_version = System.getProperty("opensearch.version", "1.0.0-beta1")
         kotlin_version = System.getProperty("kotlin.version", "1.4.0")
     }
 
@@ -130,7 +130,7 @@ plugins.withId('org.jetbrains.kotlin.jvm') {
 
 allprojects {
     group = "com.amazon.opendistroforelasticsearch"
-    version = "${opensearchVersion}.0-alpha2"
+    version = "${opensearchVersion}.0-beta1"
 
     plugins.withId('java') {
         sourceCompatibility = targetCompatibility = "1.8"