From 19a0c7726c9bed2e993097f17af1d9f40f524bf9 Mon Sep 17 00:00:00 2001 From: Owais Kazi Date: Fri, 7 Jul 2023 15:29:42 -0700 Subject: [PATCH] Exclude bwc test for MacOS (#414) * Used snapshot url for macos Signed-off-by: owaiskazi19 * Added case for ubuntu and windows Signed-off-by: owaiskazi19 * Exclude bwcTest for macOS Signed-off-by: owaiskazi19 * Exclude bwcTest for MacOS Signed-off-by: owaiskazi19 --------- Signed-off-by: owaiskazi19 --- .github/workflows/ci.yml | 2 +- sample-extension-plugin/build.gradle | 5 ++++- settings.gradle | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b6e9fb0..90c10fe0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: - name: Build and Test run: | - ./gradlew build -x bwcTestSuite + ./gradlew build - name: Publish to Maven Local run: | diff --git a/sample-extension-plugin/build.gradle b/sample-extension-plugin/build.gradle index 23e96727..e0506f73 100644 --- a/sample-extension-plugin/build.gradle +++ b/sample-extension-plugin/build.gradle @@ -9,6 +9,7 @@ apply plugin: 'opensearch.java-rest-test' import org.opensearch.gradle.test.RestIntegTestTask import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask +import org.apache.tools.ant.taskdefs.condition.Os import java.util.concurrent.Callable @@ -278,7 +279,9 @@ task bwcTestSuite(type: StandaloneRestIntegTestTask) { dependsOn tasks.named("${baseName}#rollingUpgradeClusterTask") dependsOn tasks.named("${baseName}#fullRestartClusterTask") } -tasks.named("check").configure {dependsOn(bwcTestSuite)} +if (!(Os.isFamily(Os.FAMILY_MAC))) { + tasks.named("check").configure {dependsOn(bwcTestSuite)} +} run { doFirst { diff --git a/settings.gradle b/settings.gradle index 00189eec..89529542 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,4 +10,4 @@ project(":spi").name = rootProject.name + "-spi" include "sample-extension-plugin" project(":sample-extension-plugin").name = rootProject.name + "-sample-extension" -startParameter.excludedTaskNames=["publishPluginZipPublicationToMavenLocal", "publishPluginZipPublicationToStagingRepository", "bwcTestSuite"] +startParameter.excludedTaskNames=["publishPluginZipPublicationToMavenLocal", "publishPluginZipPublicationToStagingRepository"]