Remove rc1 qualifier for 2.0 (#600)

* Remove rc1 qualifier for 2.0 Signed-off-by: Joshua Li <[email protected]> (cherry picked from commit d71cddc)
opensearch-project · May 13, 2022 · 6b37929 · 6b37929
1 parent eb65d2d
commit 6b37929
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,9 +6,9 @@
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "2.0.0-rc1-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.0.0-SNAPSHOT")
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-        buildVersionQualifier = System.getProperty("build.version_qualifier", "rc1")
+        buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         version_tokens = opensearch_version.tokenize('-')
         opensearch_build = version_tokens[0] + '.0'
         if (buildVersionQualifier) {
@@ -46,11 +46,6 @@ repositories {
     mavenCentral() // For Elastic Libs that you can use to get started coding until open OpenSearch libs are available
 }
 
-ext {
-    isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-    buildVersionQualifier = System.getProperty("build.version_qualifier", "rc1")
-}
-
 allprojects {
     version = opensearch_version.tokenize('-')[0] + '.0'
     if (buildVersionQualifier) {

diff --git a/doctest/build.gradle b/doctest/build.gradle
@@ -49,10 +49,14 @@ build.dependsOn doctest
 clean.dependsOn(cleanBootstrap)
 
 // 2.0.0-alpha1-SNAPSHOT -> 2.0.0.0-alpha1-SNAPSHOT
-String opensearch_no_snapshot = opensearch_version.replace("-SNAPSHOT","")
-String opensearch_build = opensearch_no_snapshot.tokenize('-')[0] + '.0-' + opensearch_no_snapshot.tokenize('-')[1]
-String mlCommonsRemoteFile = 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/' + opensearch_no_snapshot + '/2500/linux/x64/tar/builds/opensearch/plugins/opensearch-ml-' + opensearch_build +'.zip'
-String mlCommonsPlugin = "ml-commons"
+String opensearch_no_snapshot = opensearch_version.replace('-SNAPSHOT', '')
+String[] version_tokens = opensearch_no_snapshot.tokenize('-')
+String opensearch_build = version_tokens[0] + '.0'
+if (version_tokens.length > 1) {
+    opensearch_build += '-' + version_tokens[1]
+}
+String mlCommonsRemoteFile = 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/' + opensearch_no_snapshot + '/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-ml-' + opensearch_build + '.zip'
+String mlCommonsPlugin = 'opensearch-ml'
 
 testClusters {
     docTestCluster {
@@ -66,9 +70,9 @@ testClusters {
                         if (!dir.exists()) {
                             dir.mkdirs()
                         }
-                        File f = new File(dir, mlCommonsPlugin)
+                        File f = new File(dir, mlCommonsPlugin + '-' + opensearch_build + '.zip')
                         if (!f.exists()) {
-                            new URL(mlCommonsRemoteFile).withInputStream{ ins -> f.withOutputStream{ it << ins }}
+                            new URL(mlCommonsRemoteFile).withInputStream{ ins -> f.withOutputStream{ it << ins } }
                         }
                         return fileTree(mlCommonsPlugin).getSingleFile()
                     }

diff --git a/doctest/opensearch-ml/.gitignore b/doctest/opensearch-ml/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/workbench/opensearch_dashboards.json b/workbench/opensearch_dashboards.json
@@ -1,6 +1,6 @@
 {
   "id": "queryWorkbenchDashboards",
-  "version": "2.0.0.0-rc1",
+  "version": "2.0.0.0",
   "opensearchDashboardsVersion": "2.0.0",
   "server": true,
   "ui": true,

diff --git a/workbench/package.json b/workbench/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opensearch-query-workbench",
-  "version": "2.0.0.0-rc1",
+  "version": "2.0.0.0",
   "description": "Query Workbench",
   "main": "index.js",
   "license": "Apache-2.0",