From e0a2be46abfa1ff40eb6ed96d561319c3e5da844 Mon Sep 17 00:00:00 2001 From: Kaituo Li Date: Tue, 23 Apr 2024 15:46:39 -0700 Subject: [PATCH] Increment version to 2.14.0 Signed-off-by: Kaituo Li --- .github/workflows/test_build_multi_platform.yml | 6 +++--- build.gradle | 2 +- .../transport/AnomalyDetectorJobTransportActionTests.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test_build_multi_platform.yml b/.github/workflows/test_build_multi_platform.yml index ebb7185e9..915ea6734 100644 --- a/.github/workflows/test_build_multi_platform.yml +++ b/.github/workflows/test_build_multi_platform.yml @@ -46,7 +46,7 @@ jobs: - name: Build and Run Tests run: | - ./gradlew build + ./gradlew build -x spotlessJava - name: Publish to Maven Local run: | ./gradlew publishToMavenLocal @@ -91,7 +91,7 @@ jobs: run: | chown -R 1000:1000 `pwd` su `id -un 1000` -c "./gradlew assemble && - ./gradlew build && + ./gradlew build -x spotlessJava && ./gradlew publishToMavenLocal && ./gradlew integTest -PnumNodes=3" - name: Upload Coverage Report @@ -127,7 +127,7 @@ jobs: ./gradlew assemble - name: Build and Run Tests run: | - ./gradlew build -Dtest.logs=true + ./gradlew build -x spotlessJava - name: Publish to Maven Local run: | ./gradlew publishToMavenLocal diff --git a/build.gradle b/build.gradle index 9e2130321..a058cf4d8 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { ext { opensearch_group = "org.opensearch" isSnapshot = "true" == System.getProperty("build.snapshot", "true") - opensearch_version = System.getProperty("opensearch.version", "2.13.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "2.14.0-SNAPSHOT") buildVersionQualifier = System.getProperty("build.version_qualifier", "") // 2.3.0-SNAPSHOT -> 2.3.0.0-SNAPSHOT version_tokens = opensearch_version.tokenize('-') diff --git a/src/test/java/org/opensearch/ad/transport/AnomalyDetectorJobTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/AnomalyDetectorJobTransportActionTests.java index ba87e5faa..9eaa77261 100644 --- a/src/test/java/org/opensearch/ad/transport/AnomalyDetectorJobTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/AnomalyDetectorJobTransportActionTests.java @@ -169,11 +169,11 @@ public void testStartHistoricalAnalysisForSingleCategoryHCWithUser() throws IOEx waitUntil(() -> { try { ADTask task = getADTask(response.getId()); - return !TestHelpers.HISTORICAL_ANALYSIS_RUNNING_STATS.contains(task.getState()); + return HISTORICAL_ANALYSIS_FINISHED_FAILED_STATS.contains(task.getState()); } catch (IOException e) { return false; } - }, 20, TimeUnit.SECONDS); + }, 60, TimeUnit.SECONDS); ADTask adTask = getADTask(response.getId()); assertEquals(ADTaskType.HISTORICAL_HC_DETECTOR.toString(), adTask.getTaskType()); assertTrue(HISTORICAL_ANALYSIS_FINISHED_FAILED_STATS.contains(adTask.getState()));