From 708161dd510866c2326e7774133c0bd02fbdfe0e Mon Sep 17 00:00:00 2001 From: dblock Date: Wed, 29 Dec 2021 09:23:07 -0500 Subject: [PATCH 1/2] Incremented version to 1.2.4. Signed-off-by: dblock --- .github/workflows/multi-node-test-workflow.yml | 2 +- .github/workflows/test-workflow.yml | 4 ++-- alerting/build.gradle | 2 +- build.gradle | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml index bc7f0f5a8..aa897d1b3 100644 --- a/.github/workflows/multi-node-test-workflow.yml +++ b/.github/workflows/multi-node-test-workflow.yml @@ -32,7 +32,7 @@ jobs: with: java-version: 14 - name: Run integration tests with multi node config - run: ./gradlew integTest -PnumNodes=3 -Dopensearch.version=1.2.3-SNAPSHOT + run: ./gradlew integTest -PnumNodes=3 -Dopensearch.version=1.2.4-SNAPSHOT - 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 40c86805a..bb2f21a7c 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -30,7 +30,7 @@ jobs: java-version: ${{ matrix.java }} - name: Build and run with Gradle - run: ./gradlew build -Dopensearch.version=1.2.3-SNAPSHOT + run: ./gradlew build -Dopensearch.version=1.2.4-SNAPSHOT # - name: Create Artifact Path # run: | @@ -49,4 +49,4 @@ jobs: # path: alerting-artifacts # Publish to local maven - name: Publish to Maven Local - run: ./gradlew publishToMavenLocal -Dopensearch.version=1.2.3-SNAPSHOT + run: ./gradlew publishToMavenLocal -Dopensearch.version=1.2.4-SNAPSHOT diff --git a/alerting/build.gradle b/alerting/build.gradle index 8cc70ccdd..ca3abe37a 100644 --- a/alerting/build.gradle +++ b/alerting/build.gradle @@ -182,7 +182,7 @@ String bwcFilePath = "src/test/resources/bwc" testClusters { "${baseName}$i" { testDistribution = "ARCHIVE" - versions = ["7.10.2","1.2.3-SNAPSHOT"] + versions = ["7.10.2","1.2.4-SNAPSHOT"] numberOfNodes = 3 plugin(provider(new Callable(){ @Override diff --git a/build.gradle b/build.gradle index 1d81eabe8..9ef63df65 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ buildscript { apply from: 'build-tools/repositories.gradle' ext { - opensearch_version = System.getProperty("opensearch.version", "1.2.3-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.2.4-SNAPSHOT") // 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') common_utils_version = System.getProperty("common_utils.version", opensearch_build) From d3a8f6be64f766ee5e647d41101b9bbf08ebe3ba Mon Sep 17 00:00:00 2001 From: dblock Date: Wed, 29 Dec 2021 15:02:19 -0500 Subject: [PATCH 2/2] Run tests on all PRs. Signed-off-by: dblock --- .github/workflows/test-workflow.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index bb2f21a7c..1146b3c59 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -1,14 +1,5 @@ name: Test Workflow -# This workflow is triggered on pull requests and pushes to main or an opendistro release branch -on: - pull_request: - branches: - - main - - opendistro-* - push: - branches: - - main - - opendistro-* +on: [pull_request, push] jobs: build: