open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hopefully fix wildfly smoke test on windows (#6411) 

* Hopefully fix wildfly jdk8 smoke test on windows

* jdk18 also fails

* also add the jvm options that were added by wildfly startup script
This commit is contained in:
Lauri Tulmin 2022-08-03 14:31:58 +03:00 committed by GitHub
parent 0b15109107
commit d1e46556b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WildflySmokeTest.groovy
View File

@ -41,8 +41,19 @@ abstract class WildflySmokeTest extends AppServerTest {
}
}
abstract class WildflyJdk8SmokeTest extends WildflySmokeTest {
@Override
protected Map<String, String> getExtraEnv() {
// https://github.com/openjdk/jdk8u/commit/d72d28967d732ba32e02178b828255378c5a8938
// introduces a changes that causes wildfly to throw java.io.FileNotFoundException: Invalid file
// path on windows
return Collections.singletonMap("JAVA_OPTS", "-Djdk.io.File.enableADS=true " +
"-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true")
}
}
@AppServer(version = "13.0.0.Final", jdk = "8")
class Wildfly13Jdk8 extends WildflySmokeTest {
class Wildfly13Jdk8 extends WildflyJdk8SmokeTest {
}
@AppServer(version = "13.0.0.Final", jdk = "8-openj9")
@ -50,7 +61,7 @@ class Wildfly13Jdk8Openj9 extends WildflySmokeTest {
}
@AppServer(version = "17.0.1.Final", jdk = "8")
class Wildfly17Jdk8 extends WildflySmokeTest {
class Wildfly17Jdk8 extends WildflyJdk8SmokeTest {
}
@AppServer(version = "17.0.1.Final", jdk = "11")
@ -63,7 +74,7 @@ class Wildfly17Jdk17 extends WildflySmokeTest {
// TODO (trask) remove Java 18 test once Java 19 is GA
@AppServer(version = "17.0.1.Final", jdk = "18")
class Wildfly17Jdk18 extends WildflySmokeTest {
class Wildfly17Jdk18 extends WildflyJdk8SmokeTest {
}
@AppServer(version = "17.0.1.Final", jdk = "19")
@ -71,7 +82,7 @@ class Wildfly17Jdk19 extends WildflySmokeTest {
}
@AppServer(version = "21.0.0.Final", jdk = "8")
class Wildfly21Jdk8 extends WildflySmokeTest {
class Wildfly21Jdk8 extends WildflyJdk8SmokeTest {
}
@AppServer(version = "21.0.0.Final", jdk = "11")
@ -84,7 +95,7 @@ class Wildfly21Jdk17 extends WildflySmokeTest {
// TODO (trask) remove Java 18 test once Java 19 is GA
@AppServer(version = "21.0.0.Final", jdk = "18")
class Wildfly21Jdk18 extends WildflySmokeTest {
class Wildfly21Jdk18 extends WildflyJdk8SmokeTest {
}
@AppServer(version = "21.0.0.Final", jdk = "19")
@ -92,7 +103,7 @@ class Wildfly21Jdk19 extends WildflySmokeTest {
}
@AppServer(version = "25.0.1.Final", jdk = "8")
class Wildfly25Jdk8 extends WildflySmokeTest {
class Wildfly25Jdk8 extends WildflyJdk8SmokeTest {
}
@AppServer(version = "25.0.1.Final", jdk = "11")
@ -105,7 +116,7 @@ class Wildfly25Jdk17 extends WildflySmokeTest {
// TODO (trask) remove Java 18 test once Java 19 is GA
@AppServer(version = "25.0.1.Final", jdk = "18")
class Wildfly25Jdk18 extends WildflySmokeTest {
class Wildfly25Jdk18 extends WildflyJdk8SmokeTest {
}
@AppServer(version = "25.0.1.Final", jdk = "19")