@@ -10,12 +10,10 @@ import org.elasticsearch.gradle.Architecture
10
10
import org.elasticsearch.gradle.VersionProperties
11
11
12
12
apply plugin : ' war'
13
- apply plugin : ' elasticsearch.build '
13
+ apply plugin : ' elasticsearch.java '
14
14
apply plugin : ' elasticsearch.test.fixtures'
15
15
apply plugin : ' elasticsearch.internal-distribution-download'
16
16
17
- testFixtures. useFixture()
18
-
19
17
dependencies {
20
18
providedCompile ' javax.enterprise:cdi-api:1.2'
21
19
providedCompile ' org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.0.Final'
@@ -42,6 +40,11 @@ tasks.named("war").configure {
42
40
archiveFileName = ' example-app.war'
43
41
}
44
42
43
+ // The wildfly docker image is only available for x86 architectures so disable these tests on arm
44
+ if (Architecture . current() == Architecture . X64 ) {
45
+ testFixtures. useFixture()
46
+ }
47
+
45
48
elasticsearch_distributions {
46
49
docker {
47
50
type = ' docker'
@@ -55,12 +58,9 @@ tasks.named("preProcessFixture").configure {
55
58
dependsOn " war" , elasticsearch_distributions. docker
56
59
}
57
60
58
- dockerCompose {
59
- useComposeFiles = [' docker-compose.yml' ]
60
- }
61
-
62
61
tasks. register(" integTest" , Test ) {
63
62
outputs. doNotCacheIf(' Build cache is disabled for Docker tests' ) { true }
63
+ onlyIf { Architecture . current() == Architecture . X64 }
64
64
maxParallelForks = ' 1'
65
65
include ' **/*IT.class'
66
66
systemProperty ' tests.security.manager' , ' false'
@@ -69,22 +69,3 @@ tasks.register("integTest", Test) {
69
69
tasks. named(" check" ). configure {
70
70
dependsOn " integTest"
71
71
}
72
- tasks. named(" test" ). configure {enabled = false }
73
- tasks. named(" dependencyLicenses" ). configure { enabled = false }
74
- tasks. named(" dependenciesInfo" ) {
75
- enabled = false
76
- }
77
-
78
- tasks. named(" thirdPartyAudit" ). configure {
79
- enabled = false
80
- }
81
-
82
- tasks. named(" testingConventions" ). configure {
83
- naming. clear()
84
- // We only have one "special" integration test here to connect to wildfly
85
- naming {
86
- IT {
87
- baseClass ' org.apache.lucene.util.LuceneTestCase'
88
- }
89
- }
90
- }
0 commit comments