From c9a497ce6f566d232cae29eb64ea9326cd262f90 Mon Sep 17 00:00:00 2001 From: "Daniel Doubrovkine (dB.)" Date: Thu, 6 Jan 2022 11:00:17 +0000 Subject: [PATCH] Incremented version to 1.2.4. (#276) Signed-off-by: dblock Signed-off-by: Sai Kumar --- .github/workflows/build.yml | 2 +- .github/workflows/bwc.yml | 4 ++-- build.gradle | 2 +- src/test/resources/security/scripts/SecurityAdminWrapper.sh | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index be60c369..282fbc99 100644 --- 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 -Dopensearch.version=1.2.0 + ./gradlew clean release -Dbuild.snapshot=true -Dopensearch.version=1.2.4-SNAPSHOT - name: Upload failed logs uses: actions/upload-artifact@v2 if: failure() diff --git a/.github/workflows/bwc.yml b/.github/workflows/bwc.yml index 02599ed0..7fc708f2 100644 --- 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 -Dopensearch.version=1.2.0 -x test -x IntegTest + ./gradlew clean release -Dbuild.snapshot=true -Dopensearch.version=1.2.4-SNAPSHOT -x test -x IntegTest ./gradlew mixedClusterTask --stacktrace ./gradlew fullRestartClusterTask --stacktrace - name: Upload failed logs @@ -37,4 +37,4 @@ jobs: build/testclusters/*ClusterTask*/logs/* build/testclusters/bwcLeader*/logs/* build/testclusters/bwcFollower*/logs/* - build/reports/tests/* \ No newline at end of file + build/reports/tests/* diff --git a/build.gradle b/build.gradle index 68920bcd..f32e734c 100644 --- 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.0") + opensearch_version = System.getProperty("opensearch.version", "1.2.4-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') diff --git a/src/test/resources/security/scripts/SecurityAdminWrapper.sh b/src/test/resources/security/scripts/SecurityAdminWrapper.sh index 4a51489e..c39b2b75 100755 --- a/src/test/resources/security/scripts/SecurityAdminWrapper.sh +++ b/src/test/resources/security/scripts/SecurityAdminWrapper.sh @@ -13,9 +13,9 @@ BUILD_DIR=$1 LEADER_CONFIG_DIR=$BUILD_DIR/testclusters/leaderCluster-0/config -LEADER_PLUGIN_DIR=$BUILD_DIR/testclusters/leaderCluster-0/distro/1.2.0-INTEG_TEST/plugins/opensearch-security/ +LEADER_PLUGIN_DIR=$BUILD_DIR/testclusters/leaderCluster-0/distro/1.2.4-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.0-INTEG_TEST/plugins/opensearch-security/ +FOLLOWER_PLUGIN_DIR=$BUILD_DIR/testclusters/followCluster-0/distro/1.2.4-INTEG_TEST/plugins/opensearch-security/ "$LEADER_PLUGIN_DIR/tools/securityadmin.sh" -p 9300 \ -cd "$LEADER_PLUGIN_DIR/securityconfig" \