Selaa lähdekoodia

Disable wildfly integration tests on arm (#69836)

Mark Vieira 4 vuotta sitten
vanhempi
commit
02d1a1a636
2 muutettua tiedostoa jossa 7 lisäystä ja 62 poistoa
  1. 7 26
      qa/wildfly/build.gradle
  2. 0 36
      qa/wildfly/docker-compose-oss.yml

+ 7 - 26
qa/wildfly/build.gradle

@@ -10,12 +10,10 @@ import org.elasticsearch.gradle.Architecture
 import org.elasticsearch.gradle.VersionProperties
 
 apply plugin: 'war'
-apply plugin: 'elasticsearch.build'
+apply plugin: 'elasticsearch.java'
 apply plugin: 'elasticsearch.test.fixtures'
 apply plugin: 'elasticsearch.internal-distribution-download'
 
-testFixtures.useFixture()
-
 dependencies {
   providedCompile 'javax.enterprise:cdi-api:1.2'
   providedCompile 'org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.0.Final'
@@ -42,6 +40,11 @@ tasks.named("war").configure {
   archiveFileName = 'example-app.war'
 }
 
+// The wildfly docker image is only available for x86 architectures so disable these tests on arm
+if (Architecture.current() == Architecture.X64) {
+  testFixtures.useFixture()
+}
+
 elasticsearch_distributions {
   docker {
     type = 'docker'
@@ -55,12 +58,9 @@ tasks.named("preProcessFixture").configure {
   dependsOn "war", elasticsearch_distributions.docker
 }
 
-dockerCompose {
-    useComposeFiles = ['docker-compose.yml']
-}
-
 tasks.register("integTest", Test) {
   outputs.doNotCacheIf('Build cache is disabled for Docker tests') { true }
+  onlyIf { Architecture.current() == Architecture.X64 }
   maxParallelForks = '1'
   include '**/*IT.class'
   systemProperty 'tests.security.manager', 'false'
@@ -69,22 +69,3 @@ tasks.register("integTest", Test) {
 tasks.named("check").configure {
   dependsOn "integTest"
 }
-tasks.named("test").configure {enabled = false }
-tasks.named("dependencyLicenses").configure { enabled = false }
-tasks.named("dependenciesInfo") {
-  enabled = false
-}
-
-tasks.named("thirdPartyAudit").configure {
-  enabled = false
-}
-
-tasks.named("testingConventions").configure {
-  naming.clear()
-  // We only have one "special" integration test here to connect to wildfly
-  naming {
-    IT {
-      baseClass 'org.apache.lucene.util.LuceneTestCase'
-    }
-  }
-}

+ 0 - 36
qa/wildfly/docker-compose-oss.yml

@@ -1,36 +0,0 @@
-version: '3.7'
-services:
-
-  wildfly:
-    image: jboss/wildfly:18.0.1.Final
-    environment:
-      JAVA_OPTS: -Delasticsearch.uri=elasticsearch:9200 -Djboss.http.port=8080 -Djava.net.preferIPv4Stack=true
-    volumes:
-      - ./build/distributions/example-app.war:/opt/jboss/wildfly/standalone/deployments/example-app.war
-    ports:
-      - "8080"
-    healthcheck:
-      start_period: 5s
-      test: ["CMD", "grep", "Admin console listening on", "/opt/jboss/wildfly/standalone/log/server.log"]
-      interval: 2s
-      timeout: 1s
-      retries: 5
-
-  elasticsearch:
-    image: elasticsearch-oss:test
-    environment:
-      - discovery.type=single-node
-      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-      nofile:
-        soft: 65536
-        hard: 65536
-    healthcheck:
-      start_period: 15s
-      test: ["CMD", "curl", "-f", "-k", "http://localhost:9200"]
-      interval: 10s
-      timeout: 2s
-      retries: 5