From 5b73926a71d61840c5475d27abd798c34a69016e Mon Sep 17 00:00:00 2001 From: Sai Kumar Date: Sat, 16 Apr 2022 03:52:09 +0530 Subject: [PATCH] Security test workflow to build security plugin on 1.3 branch (#364) Signed-off-by: Sai Kumar --- .github/workflows/build.yml | 2 +- .github/workflows/bwc.yml | 2 +- .github/workflows/security-tests.yml | 6 +++--- build.gradle | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 00644ec2..10dfee24 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@v2 - name: Build and run Replication tests run: | - ./gradlew clean release -Dbuild.snapshot=true -Dopensearch.version=1.3.0-SNAPSHOT + ./gradlew clean release -Dbuild.snapshot=true - name: Upload failed logs uses: actions/upload-artifact@v2 if: failure() diff --git a/.github/workflows/bwc.yml b/.github/workflows/bwc.yml index d7a3342f..547edea0 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 -Dbuild.snapshot=true -Dopensearch.version=1.3.0-SNAPSHOT -x test -x IntegTest + ./gradlew clean release -Dbuild.snapshot=true -x test -x IntegTest ./gradlew mixedClusterTask --stacktrace ./gradlew fullRestartClusterTask --stacktrace - name: Upload failed logs diff --git a/.github/workflows/security-tests.yml b/.github/workflows/security-tests.yml index 13a5d751..06418753 100644 --- a/.github/workflows/security-tests.yml +++ b/.github/workflows/security-tests.yml @@ -28,16 +28,16 @@ jobs: with: repository: 'opensearch-project/security' path: security - ref: 'main' + ref: '1.3' - name: Build security working-directory: ./security run: | ./gradlew clean build -Dbuild.snapshot=false -x test - cp build/distributions/opensearch-security-1.3.0.0.zip ../src/test/resources/security/plugin/opensearch-security.zip + cp build/distributions/opensearch-security-1.3.2.0.zip ../src/test/resources/security/plugin/opensearch-security.zip - name: Build and run Replication tests run: | ls -al src/test/resources/security/plugin - ./gradlew clean release -Dbuild.snapshot=true -Dopensearch.version=1.3.0-SNAPSHOT -PnumNodes=1 -Psecurity=true + ./gradlew clean release -Dbuild.snapshot=true -PnumNodes=1 -Psecurity=true - name: Upload failed logs uses: actions/upload-artifact@v2 if: failure() diff --git a/build.gradle b/build.gradle index 535cd084..f868274f 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ import org.opensearch.gradle.test.RestIntegTestTask buildscript { ext { isSnapshot = "true" == System.getProperty("build.snapshot", "false") - opensearch_version = System.getProperty("opensearch.version", "1.3.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.3.2-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')