Skip to content

Commit 1e33867

Browse files
committed
Disable wildfly integration tests on arm (#69836)
1 parent 050cc41 commit 1e33867

File tree

2 files changed

+7
-62
lines changed

2 files changed

+7
-62
lines changed

qa/wildfly/build.gradle

+7-26
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ import org.elasticsearch.gradle.Architecture
1010
import org.elasticsearch.gradle.VersionProperties
1111

1212
apply plugin: 'war'
13-
apply plugin: 'elasticsearch.build'
13+
apply plugin: 'elasticsearch.java'
1414
apply plugin: 'elasticsearch.test.fixtures'
1515
apply plugin: 'elasticsearch.internal-distribution-download'
1616

17-
testFixtures.useFixture()
18-
1917
dependencies {
2018
providedCompile 'javax.enterprise:cdi-api:1.2'
2119
providedCompile 'org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.0.Final'
@@ -42,6 +40,11 @@ tasks.named("war").configure {
4240
archiveFileName = 'example-app.war'
4341
}
4442

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+
4548
elasticsearch_distributions {
4649
docker {
4750
type = 'docker'
@@ -55,12 +58,9 @@ tasks.named("preProcessFixture").configure {
5558
dependsOn "war", elasticsearch_distributions.docker
5659
}
5760

58-
dockerCompose {
59-
useComposeFiles = ['docker-compose.yml']
60-
}
61-
6261
tasks.register("integTest", Test) {
6362
outputs.doNotCacheIf('Build cache is disabled for Docker tests') { true }
63+
onlyIf { Architecture.current() == Architecture.X64 }
6464
maxParallelForks = '1'
6565
include '**/*IT.class'
6666
systemProperty 'tests.security.manager', 'false'
@@ -69,22 +69,3 @@ tasks.register("integTest", Test) {
6969
tasks.named("check").configure {
7070
dependsOn "integTest"
7171
}
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-
}

qa/wildfly/docker-compose-oss.yml

-36
This file was deleted.

0 commit comments

Comments
 (0)