Increment version to 1.3.0. (#278)

Signed-off-by: dblock <dblock@amazon.com> Signed-off-by: Sai Kumar <karanas@amazon.com>
opensearch-project · Jan 12, 2022 · 0d70b57 · 0d70b57
1 parent 5d3c154
commit 0d70b57
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Build and run Replication tests
         run: |
-          ./gradlew clean release -Dbuild.snapshot=true -Dopensearch.version=1.2.4-SNAPSHOT
+          ./gradlew clean release -Dbuild.snapshot=true -Dopensearch.version=1.3.0-SNAPSHOT
       - name: Upload failed logs
         uses: actions/upload-artifact@v2
         if: failure()

diff --git a/.github/workflows/bwc.yml b/.github/workflows/bwc.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Build and run Replication tests
         run: |
           echo "Running backwards compatibility tests ..."
-          ./gradlew clean release -Dbuild.snapshot=true -Dopensearch.version=1.2.4-SNAPSHOT -x test -x IntegTest
+          ./gradlew clean release -Dbuild.snapshot=true -Dopensearch.version=1.3.0-SNAPSHOT -x test -x IntegTest
           ./gradlew mixedClusterTask --stacktrace
           ./gradlew fullRestartClusterTask --stacktrace
       - name: Upload failed logs

diff --git a/build.gradle b/build.gradle
@@ -30,7 +30,7 @@ import org.opensearch.gradle.test.RestIntegTestTask
 buildscript {
     ext {
         isSnapshot = "true" == System.getProperty("build.snapshot", "false")
-        opensearch_version = System.getProperty("opensearch.version", "1.2.4-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "1.3.0-SNAPSHOT")
         // Taken from https://github.com/opensearch-project/alerting/blob/main/build.gradle#L33
         // 1.0.0 -> 1.0.0.0, and 1.0.0-SNAPSHOT -> 1.0.0.0-SNAPSHOT
         opensearch_build = opensearch_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2')
@@ -705,4 +705,4 @@ task "bwcTestSuite"(type: RestIntegTestTask) {
     dependsOn tasks.named("mixedClusterTask")
     dependsOn tasks.named("rollingUpgradeClusterTask")
     dependsOn tasks.named("fullRestartClusterTask")
-}
+}
diff --git a/src/test/resources/security/scripts/SecurityAdminWrapper.sh b/src/test/resources/security/scripts/SecurityAdminWrapper.sh
@@ -13,9 +13,10 @@
 
 BUILD_DIR=$1
 LEADER_CONFIG_DIR=$BUILD_DIR/testclusters/leaderCluster-0/config
-LEADER_PLUGIN_DIR=$BUILD_DIR/testclusters/leaderCluster-0/distro/1.2.4-INTEG_TEST/plugins/opensearch-security/
+LEADER_PLUGIN_DIR=$BUILD_DIR/testclusters/leaderCluster-0/distro/1.3.0-INTEG_TEST/plugins/opensearch-security/
 FOLLOWER_CONFIG_DIR=$BUILD_DIR/testclusters/followCluster-0/config
-FOLLOWER_PLUGIN_DIR=$BUILD_DIR/testclusters/followCluster-0/distro/1.2.4-INTEG_TEST/plugins/opensearch-security/
+FOLLOWER_PLUGIN_DIR=$BUILD_DIR/testclusters/followCluster-0/distro/1.3.0-INTEG_TEST/plugins/opensearch-security/
+>>>>>>> ce6da91 (Increment version to 1.3.0.)
 
 "$LEADER_PLUGIN_DIR/tools/securityadmin.sh" -p 9300 \
 -cd "$LEADER_PLUGIN_DIR/securityconfig" \