Fix test convention failures on Windows

qa/smoke-test-plugins/build.gradle

@@ -6,8 +6,7 @@
  * Side Public License, v 1.
  */
 
-
-import org.apache.tools.ant.taskdefs.condition.Os
+import org.elasticsearch.gradle.OS
 import org.elasticsearch.gradle.internal.MavenFilteringHack
 import org.elasticsearch.gradle.internal.info.BuildParams
 
@@ -43,6 +42,6 @@ tasks.named("processTestResources").configure {
 }
 
 // AwaitsFix https://github.com/elastic/elasticsearch/issues/73539
-if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-  tasks.named("integTest").configure {enabled = false }
+tasks.named("integTest").configure {
+  onlyIf { OS.current() != OS.WINDOWS }
 }

x-pack/plugin/repository-encrypted/build.gradle

@@ -1,4 +1,4 @@
-import org.apache.tools.ant.taskdefs.condition.Os
+import org.elasticsearch.gradle.OS
 
 evaluationDependsOn(xpackModule('core'))
 
@@ -20,6 +20,7 @@ dependencies {
 }
 
 // AwaitsFix https://github.com/elastic/elasticsearch/issues/73539
-if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-  tasks.named("internalClusterTest").configure {enabled = false }
+tasks.named("internalClusterTest").configure {
+  onlyIf { OS.current() != OS.WINDOWS }
 }
+

x-pack/plugin/repository-encrypted/qa/azure/build.gradle

@@ -1,4 +1,4 @@
-import org.apache.tools.ant.taskdefs.condition.Os
+import org.elasticsearch.gradle.OS
 
 apply plugin: 'elasticsearch.internal-cluster-test'
 apply plugin: 'elasticsearch.java'
@@ -9,6 +9,6 @@ dependencies {
 }
 
 // AwaitsFix https://github.com/elastic/elasticsearch/issues/73539
-if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-  tasks.named("internalClusterTest").configure {enabled = false }
+tasks.named("internalClusterTest").configure {
+  onlyIf { OS.current() != OS.WINDOWS }
 }

x-pack/plugin/repository-encrypted/qa/gcs/build.gradle

@@ -1,4 +1,4 @@
-import org.apache.tools.ant.taskdefs.condition.Os
+import org.elasticsearch.gradle.OS
 
 apply plugin: 'elasticsearch.internal-cluster-test'
 apply plugin: 'elasticsearch.java'
@@ -9,6 +9,7 @@ dependencies {
 }
 
 // AwaitsFix https://github.com/elastic/elasticsearch/issues/73539
-if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-  tasks.named("internalClusterTest").configure {enabled = false }
+tasks.named("internalClusterTest").configure {
+  onlyIf { OS.current() != OS.WINDOWS }
 }
+

x-pack/plugin/repository-encrypted/qa/s3/build.gradle

@@ -1,4 +1,4 @@
-import org.apache.tools.ant.taskdefs.condition.Os
+import org.elasticsearch.gradle.OS
 
 apply plugin: 'elasticsearch.internal-cluster-test'
 apply plugin: 'elasticsearch.java'
@@ -9,6 +9,6 @@ dependencies {
 }
 
 // AwaitsFix https://github.com/elastic/elasticsearch/issues/73539
-if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-  tasks.named("internalClusterTest").configure {enabled = false }
+tasks.named("internalClusterTest").configure {
+  onlyIf { OS.current() != OS.WINDOWS }
 }