From acfc26cae64af8cb68ea4857c41137e57c7ce460 Mon Sep 17 00:00:00 2001
From: dblock <dblock@amazon.com>
Date: Sat, 14 Aug 2021 18:50:40 +0000
Subject: [PATCH] Build snapshot version by default.

Signed-off-by: dblock <dblock@amazon.com>
---
 .github/workflows/CI.yml | 17 +++++++----------
 build.gradle             |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index eed342510..966b37288 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -33,7 +33,7 @@ jobs:
         with:
           repository: 'opensearch-project/OpenSearch'
           path: OpenSearch
-          ref: 'main'
+          ref: '1.x'
       - name: Build OpenSearch
         working-directory: ./OpenSearch
         run: ./gradlew publishToMavenLocal
@@ -59,11 +59,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 +83,14 @@ jobs:
 
       - name: Multi Nodes Integration Testing
         run: |
-          ./gradlew integTest  -PnumNodes=3
+          ./gradlew integTest -PnumNodes=3
 
       - name: Pull and Run Docker
         run: |
-          ## 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
+          plugin=`ls build/distributions/*.zip`
           version=1.1.0-SNAPSHOT
-          plugin_version=1.1.0.0
-          echo $version
+          plugin_version=1.1.0.0-SNAPSHOT
+          echo Using OpenSearch $version with AD $plugin_version
           cd ..
           if docker pull opensearchstaging/opensearch:$version
           then
diff --git a/build.gradle b/build.gradle
index 11aac7806..d53370810 100644
--- 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"
     }