Build snapshot version by default.

Signed-off-by: dblock <dblock@amazon.com>
opensearch-project · Aug 16, 2021 · b9eead5 · b9eead5
1 parent 581baa5
commit b9eead5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -33,7 +33,11 @@ jobs:
         with:
           repository: 'opensearch-project/OpenSearch'
           path: OpenSearch
+<<<<<<< HEAD
           ref: 'main'
+=======
+          ref: '1.x'
+>>>>>>> Build snapshot version by default.
       - name: Build OpenSearch
         working-directory: ./OpenSearch
         run: ./gradlew publishToMavenLocal
@@ -59,11 +63,11 @@ jobs:
 
       - name: Build job-scheduler
         working-directory: ./job-scheduler
-        run: ./gradlew publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT -Dbuild.snapshot=false
+        run: ./gradlew publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT
       - name: Assemble job-scheduler
         working-directory: ./job-scheduler
         run: |
-          ./gradlew assemble -Dopensearch.version=1.1.0-SNAPSHOT -Dbuild.snapshot=false
+          ./gradlew assemble -Dopensearch.version=1.1.0-SNAPSHOT
           echo "Creating ../src/test/resources/job-scheduler ..."
           mkdir -p ../src/test/resources/job-scheduler
           pwd
@@ -83,17 +87,24 @@ jobs:
 
       - name: Multi Nodes Integration Testing
         run: |
-          ./gradlew integTest  -PnumNodes=3
+          ./gradlew integTest -PnumNodes=3
 
       - name: Pull and Run Docker
         run: |
+<<<<<<< HEAD
           ## plugin=`ls build/distributions/*.zip`
           ## version=`echo $plugin|awk -F- '{print $4}'| cut -d. -f 1-3`
           ## plugin_version=`echo $plugin|awk -F- '{print $4}'| cut -d. -f 1-4`
           ## TODO: remove these two hard code versions below after GA release
           version=1.1.0-SNAPSHOT
           plugin_version=1.1.0.0
           echo $version
+=======
+          plugin=`ls build/distributions/*.zip`
+          version=1.1.0-SNAPSHOT
+          plugin_version=1.1.0.0-SNAPSHOT
+          echo Using OpenSearch $version with AD $plugin_version
+>>>>>>> Build snapshot version by default.
           cd ..
           if docker pull opensearchstaging/opensearch:$version
           then

diff --git a/build.gradle b/build.gradle
@@ -79,7 +79,7 @@ ext {
 allprojects {
     group = 'org.opensearch'
 
-    version = "${opensearch_version}" - "-SNAPSHOT" + ".0"
+    version = opensearch_version - "-SNAPSHOT" + ".0"
     if (isSnapshot) {
         version += "-SNAPSHOT"
     }