From c0698ca5b99bd1cb568c605243f82ddbb70c2254 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Thu, 31 Mar 2022 13:12:49 -0400 Subject: [PATCH] Add build qualifier default to alpha1 for 2.0.0 (#373) * Add build qualifier default to alpha1 for 2.0.0 Signed-off-by: Peter Zhu * Update workflows Signed-off-by: Peter Zhu --- .github/workflows/bwc-test-workflow.yml | 2 +- .github/workflows/multi-node-test-workflow.yml | 2 +- .github/workflows/security-test-workflow.yml | 2 +- .github/workflows/test-workflow.yml | 2 +- build.gradle | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bwc-test-workflow.yml b/.github/workflows/bwc-test-workflow.yml index ea28b76c8..423fd22ab 100644 --- a/.github/workflows/bwc-test-workflow.yml +++ b/.github/workflows/bwc-test-workflow.yml @@ -34,4 +34,4 @@ jobs: - name: Run Alerting Backwards Compatibility Tests run: | echo "Running backwards compatibility tests..." - ./gradlew bwcTestSuite -Dbuild.qualifier=alpha1 + ./gradlew bwcTestSuite diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml index 4722b58a0..683b992f1 100644 --- a/.github/workflows/multi-node-test-workflow.yml +++ b/.github/workflows/multi-node-test-workflow.yml @@ -27,4 +27,4 @@ jobs: - name: Checkout Branch uses: actions/checkout@v2 - name: Run integration tests with multi node config - run: ./gradlew integTest -PnumNodes=3 -Dbuild.qualifier=alpha1 + run: ./gradlew integTest -PnumNodes=3 diff --git a/.github/workflows/security-test-workflow.yml b/.github/workflows/security-test-workflow.yml index 8dfe68b5f..f55f14bdd 100644 --- a/.github/workflows/security-test-workflow.yml +++ b/.github/workflows/security-test-workflow.yml @@ -33,7 +33,7 @@ jobs: java-version: 11 - name: Build Alerting # Only assembling since the full build is governed by other workflows - run: ./gradlew assemble -Dbuild.qualifier=alpha1 + run: ./gradlew assemble - name: Pull and Run Docker run: | plugin=`ls alerting/build/distributions/*.zip` diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index b764b39c7..012c1534a 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -27,7 +27,7 @@ jobs: with: java-version: ${{ matrix.java }} - name: Build and run with Gradle - run: ./gradlew build -Dbuild.qualifier=alpha1 + run: ./gradlew build - name: Create Artifact Path run: | mkdir -p alerting-artifacts diff --git a/build.gradle b/build.gradle index 14baeec5a..781ae4573 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { ext { opensearch_version = System.getProperty("opensearch.version", "2.0.0-alpha1-SNAPSHOT") - buildVersionQualifier = System.getProperty("build.version_qualifier") + buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1") isSnapshot = "true" == System.getProperty("build.snapshot", "true") // 2.0.0-alpha1-SNAPSHOT -> 2.0.0.0-alpha1-SNAPSHOT version_tokens = opensearch_version.tokenize('-')