From 72b284776673fff73551e0577bf3df0d16b61288 Mon Sep 17 00:00:00 2001 From: Yang Wang Date: Thu, 3 Jun 2021 13:13:38 +1000 Subject: [PATCH] [CI] Mute failing tests for Windows Relates: #73539 --- qa/smoke-test-plugins/build.gradle | 6 ++++++ x-pack/plugin/repository-encrypted/build.gradle | 6 ++++++ x-pack/plugin/repository-encrypted/qa/azure/build.gradle | 5 +++++ x-pack/plugin/repository-encrypted/qa/gcs/build.gradle | 5 +++++ x-pack/plugin/repository-encrypted/qa/s3/build.gradle | 5 +++++ 5 files changed, 27 insertions(+) diff --git a/qa/smoke-test-plugins/build.gradle b/qa/smoke-test-plugins/build.gradle index 8b886db84d13d..3a8880e4f9d0f 100644 --- a/qa/smoke-test-plugins/build.gradle +++ b/qa/smoke-test-plugins/build.gradle @@ -6,6 +6,8 @@ * Side Public License, v 1. */ + +import org.apache.tools.ant.taskdefs.condition.Os import org.elasticsearch.gradle.internal.MavenFilteringHack import org.elasticsearch.gradle.internal.info.BuildParams @@ -39,3 +41,7 @@ tasks.named("processTestResources").configure { inputs.properties(expansions) MavenFilteringHack.filter(it, expansions) } + +if (Os.isFamily(Os.FAMILY_WINDOWS)) { + tasks.named("integTest").configure {enabled = false } +} diff --git a/x-pack/plugin/repository-encrypted/build.gradle b/x-pack/plugin/repository-encrypted/build.gradle index ec8fe14087eda..1e6785846caa4 100644 --- a/x-pack/plugin/repository-encrypted/build.gradle +++ b/x-pack/plugin/repository-encrypted/build.gradle @@ -1,3 +1,5 @@ +import org.apache.tools.ant.taskdefs.condition.Os + evaluationDependsOn(xpackModule('core')) apply plugin: 'elasticsearch.internal-es-plugin' @@ -16,3 +18,7 @@ dependencies { compileOnly project(path: xpackModule('core')) testImplementation(testArtifact(project(xpackModule('core')))) } + +if (Os.isFamily(Os.FAMILY_WINDOWS)) { + tasks.named("internalClusterTest").configure {enabled = false } +} diff --git a/x-pack/plugin/repository-encrypted/qa/azure/build.gradle b/x-pack/plugin/repository-encrypted/qa/azure/build.gradle index aabe7e1b0c6b4..9c31851b9ad69 100644 --- a/x-pack/plugin/repository-encrypted/qa/azure/build.gradle +++ b/x-pack/plugin/repository-encrypted/qa/azure/build.gradle @@ -1,3 +1,4 @@ +import org.apache.tools.ant.taskdefs.condition.Os apply plugin: 'elasticsearch.internal-cluster-test' apply plugin: 'elasticsearch.java' @@ -6,3 +7,7 @@ dependencies { internalClusterTestImplementation testArtifact(project(':plugins:repository-azure'), 'internalClusterTest') internalClusterTestImplementation testArtifact(project(':x-pack:plugin:repository-encrypted'), 'test') } + +if (Os.isFamily(Os.FAMILY_WINDOWS)) { + tasks.named("internalClusterTest").configure {enabled = false } +} diff --git a/x-pack/plugin/repository-encrypted/qa/gcs/build.gradle b/x-pack/plugin/repository-encrypted/qa/gcs/build.gradle index bd4f05b065f35..70548cd58cece 100644 --- a/x-pack/plugin/repository-encrypted/qa/gcs/build.gradle +++ b/x-pack/plugin/repository-encrypted/qa/gcs/build.gradle @@ -1,3 +1,4 @@ +import org.apache.tools.ant.taskdefs.condition.Os apply plugin: 'elasticsearch.internal-cluster-test' apply plugin: 'elasticsearch.java' @@ -6,3 +7,7 @@ dependencies { internalClusterTestImplementation testArtifact(project(':plugins:repository-gcs'), 'internalClusterTest') internalClusterTestImplementation testArtifact(project(':x-pack:plugin:repository-encrypted'), 'test') } + +if (Os.isFamily(Os.FAMILY_WINDOWS)) { + tasks.named("internalClusterTest").configure {enabled = false } +} diff --git a/x-pack/plugin/repository-encrypted/qa/s3/build.gradle b/x-pack/plugin/repository-encrypted/qa/s3/build.gradle index fbde963e9ba0d..02660a30f7201 100644 --- a/x-pack/plugin/repository-encrypted/qa/s3/build.gradle +++ b/x-pack/plugin/repository-encrypted/qa/s3/build.gradle @@ -1,3 +1,4 @@ +import org.apache.tools.ant.taskdefs.condition.Os apply plugin: 'elasticsearch.internal-cluster-test' apply plugin: 'elasticsearch.java' @@ -6,3 +7,7 @@ dependencies { internalClusterTestImplementation testArtifact(project(':plugins:repository-s3'), 'internalClusterTest') internalClusterTestImplementation testArtifact(project(':x-pack:plugin:repository-encrypted'), 'test') } + +if (Os.isFamily(Os.FAMILY_WINDOWS)) { + tasks.named("internalClusterTest").configure {enabled = false } +}