Use windows-latest (#7299)
This commit is contained in:
Trask Stalnaker
GitHub
parent
db48ba147a
commit
a4740264c2
|
|
@ -221,7 +221,7 @@ jobs:
|
|||
strategy:
|
||||
matrix:
|
||||
os:
|
||||
- windows-2019
|
||||
- windows-latest
|
||||
- ubuntu-latest
|
||||
smoke-test-suite:
|
||||
- jetty
|
||||
|
|
@ -233,14 +233,14 @@ jobs:
|
|||
- wildfly
|
||||
- other
|
||||
exclude:
|
||||
- os: ${{ inputs.skip-windows-smoke-tests && 'windows-2019' || '' }}
|
||||
- os: windows-2019
|
||||
- os: ${{ inputs.skip-windows-smoke-tests && 'windows-latest' || '' }}
|
||||
- os: windows-latest
|
||||
smoke-test-suite: websphere
|
||||
fail-fast: false
|
||||
steps:
|
||||
- name: Support long paths
|
||||
run: git config --system core.longpaths true
|
||||
if: matrix.os == 'windows-2019'
|
||||
if: matrix.os == 'windows-latest'
|
||||
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ jobs:
|
|||
uses: ./.github/workflows/build-common.yml
|
||||
with:
|
||||
# windows smoke tests are slower, and it's rare for only the windows smoke tests to break
|
||||
skip-windows-smoke-tests: ${{ !contains(github.event.pull_request.labels.*.name, 'test windows') }}
|
||||
skip-windows-smoke-tests: false
|
||||
cache-read-only: true
|
||||
|
||||
test-latest-deps:
|
||||
|
|
|
|||
|
|
@ -151,15 +151,18 @@ These are the application servers that the smoke tests are run against:
|
|||
|
||||
| Application server | Version | JVM | OS |
|
||||
| ----------------------------------------------------------------------------------------- | --------------------------- | ----------------- | ------------------------------ |
|
||||
| [Jetty](https://www.eclipse.org/jetty/) | 9.4.x, 10.0.x, 11.0.x | OpenJDK 8, 11, 17 | Ubuntu 18, Windows Server 2019 |
|
||||
| [Payara](https://www.payara.fish/) | 5.0.x, 5.1.x | OpenJDK 8, 11 | Ubuntu 18, Windows Server 2019 |
|
||||
| [Tomcat](http://tomcat.apache.org/) | 7.0.x | OpenJDK 8 | Ubuntu 18, Windows Server 2019 |
|
||||
| [Tomcat](http://tomcat.apache.org/) | 7.0.x, 8.5.x, 9.0.x, 10.0.x | OpenJDK 8, 11, 17 | Ubuntu 18, Windows Server 2019 |
|
||||
| [TomEE](https://tomee.apache.org/) | 7.x, 8.x | OpenJDK 8, 11, 17 | Ubuntu 18, Windows Server 2019 |
|
||||
| [Websphere Liberty Profile](https://www.ibm.com/cloud/websphere-liberty) | 20.x, 21.x | OpenJDK 8 | Ubuntu 18, Windows Server 2019 |
|
||||
| [Jetty](https://www.eclipse.org/jetty/) | 9.4.x, 10.0.x, 11.0.x | OpenJDK 8, 11, 17 | [`ubuntu-latest`], [`windows-latest`] |
|
||||
| [Payara](https://www.payara.fish/) | 5.0.x, 5.1.x | OpenJDK 8, 11 | [`ubuntu-latest`], [`windows-latest`] |
|
||||
| [Tomcat](http://tomcat.apache.org/) | 7.0.x | OpenJDK 8 | [`ubuntu-latest`], [`windows-latest`] |
|
||||
| [Tomcat](http://tomcat.apache.org/) | 7.0.x, 8.5.x, 9.0.x, 10.0.x | OpenJDK 8, 11, 17 | [`ubuntu-latest`], [`windows-latest`] |
|
||||
| [TomEE](https://tomee.apache.org/) | 7.x, 8.x | OpenJDK 8, 11, 17 | [`ubuntu-latest`], [`windows-latest`] |
|
||||
| [Websphere Liberty Profile](https://www.ibm.com/cloud/websphere-liberty) | 20.x, 21.x | OpenJDK 8 | [`ubuntu-latest`], [`windows-latest`] |
|
||||
| [Websphere Traditional](https://www.ibm.com/uk-en/cloud/websphere-application-server) | 8.5.5.x, 9.0.x | IBM JDK 8 | Red Hat Enterprise Linux 8.4 |
|
||||
| [WildFly](https://www.wildfly.org/) | 13.x | OpenJDK 8 | Ubuntu 18, Windows Server 2019 |
|
||||
| [WildFly](https://www.wildfly.org/) | 17.x, 21.x, 25.x | OpenJDK 8, 11, 17 | Ubuntu 18, Windows Server 2019 |
|
||||
| [WildFly](https://www.wildfly.org/) | 13.x | OpenJDK 8 | [`ubuntu-latest`], [`windows-latest`] |
|
||||
| [WildFly](https://www.wildfly.org/) | 17.x, 21.x, 25.x | OpenJDK 8, 11, 17 | [`ubuntu-latest`], [`windows-latest`] |
|
||||
|
||||
[`ubuntu-latest`]: https://github.com/actions/runner-images#available-images
|
||||
[`windows-latest`]: https://github.com/actions/runner-images#available-images
|
||||
|
||||
## JVMs and operating systems
|
||||
|
||||
|
|
@ -167,8 +170,8 @@ These are the JVMs and operating systems that the integration tests are run agai
|
|||
|
||||
| JVM | Versions | OS |
|
||||
| ------------------------------------------------------------------------------------------ | --------- | ------------------------------ |
|
||||
| [OpenJDK (Eclipse Temurin)](https://adoptium.net/) | 8, 11, 17 | Ubuntu 18, Windows Server 2019 |
|
||||
| [OpenJ9 (IBM Semeru Runtimes)](https://developer.ibm.com/languages/java/semeru-runtimes/) | 8, 11, 17 | Ubuntu 18, Windows Server 2019 |
|
||||
| [OpenJDK (Eclipse Temurin)](https://adoptium.net/) | 8, 11, 17 | [`ubuntu-latest`], [`windows-latest`] |
|
||||
| [OpenJ9 (IBM Semeru Runtimes)](https://developer.ibm.com/languages/java/semeru-runtimes/) | 8, 11, 17 | [`ubuntu-latest`] |
|
||||
|
||||
## Disabled instrumentations
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ abstract class SmokeTest {
|
|||
static void setupSpec() {
|
||||
backend =
|
||||
new GenericContainer<>(
|
||||
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20220411.2147767274")
|
||||
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20221127.3559314891")
|
||||
.withExposedPorts(8080)
|
||||
.waitingFor(Wait.forHttp("/health").forPort(8080))
|
||||
.withNetwork(network)
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ abstract class IntegrationTest {
|
|||
static void setupSpec() {
|
||||
backend =
|
||||
new GenericContainer<>(
|
||||
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20220411.2147767274")
|
||||
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20221127.3559314891")
|
||||
.withExposedPorts(8080)
|
||||
.waitingFor(Wait.forHttp("/health").forPort(8080))
|
||||
.withNetwork(network)
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ fun configureImage(parentTask: TaskProvider<out Task>, server: String, dockerfil
|
|||
} else if (vm == "openj9") {
|
||||
if (isWindows) {
|
||||
// ibm-semeru-runtimes doesn't publish windows images
|
||||
// adoptopenjdk is deprecated and doesn't publish Windows 2022 images
|
||||
// adoptopenjdk doesn't publish Windows 2022 images (and is deprecated)
|
||||
throw GradleException("Unexpected vm: $vm")
|
||||
} else {
|
||||
"ibm-semeru-runtimes:open-$jdk-jdk"
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ import java.util.jar.JarFile
|
|||
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.OS_TYPE
|
||||
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.OsTypeValues.LINUX
|
||||
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.OsTypeValues.WINDOWS
|
||||
import static org.junit.Assume.assumeFalse
|
||||
import static org.junit.Assume.assumeTrue
|
||||
|
||||
abstract class AppServerTest extends SmokeTest {
|
||||
|
|
@ -29,6 +30,11 @@ abstract class AppServerTest extends SmokeTest {
|
|||
(serverVersion, jdk) = getAppServer()
|
||||
isWindows = System.getProperty("os.name").toLowerCase().contains("windows") &&
|
||||
"1" != System.getenv("USE_LINUX_CONTAINERS")
|
||||
|
||||
// ibm-semeru-runtimes doesn't publish windows images
|
||||
// adoptopenjdk is deprecated and doesn't publish Windows 2022 images
|
||||
assumeFalse(isWindows && jdk.endsWith("-openj9"))
|
||||
|
||||
startTarget(jdk, serverVersion, isWindows)
|
||||
}
|
||||
|
||||
|
|
@ -48,7 +54,7 @@ abstract class AppServerTest extends SmokeTest {
|
|||
@Override
|
||||
protected String getTargetImage(String jdk, String serverVersion, boolean windows) {
|
||||
String platformSuffix = windows ? "-windows" : ""
|
||||
String extraTag = "20220731.2770161172"
|
||||
String extraTag = "20221127.3559314888"
|
||||
String fullSuffix = "${serverVersion}-jdk$jdk$platformSuffix-$extraTag"
|
||||
return getTargetImagePrefix() + ":" + fullSuffix
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,10 @@ class Jetty11JpmsJdk11 extends JettyJpmsSmokeTest {
|
|||
class Jetty11JpmsJdk17 extends JettyJpmsSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "11.0.7", jdk = "18")
|
||||
class Jetty11JpmsJdk18 extends JettyJpmsSmokeTest {
|
||||
@AppServer(version = "11.0.7", jdk = "19")
|
||||
class Jetty11JpmsJdk19 extends JettyJpmsSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "11.0.7", jdk = "20")
|
||||
class Jetty11JpmsJdk20 extends JettyJpmsSmokeTest {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,15 +31,14 @@ class Jetty9Jdk11 extends JettySmokeTest {
|
|||
class Jetty9Jdk17 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
// TODO (trask) remove Java 18 test once Java 19 is GA
|
||||
@AppServer(version = "9.4.39", jdk = "18")
|
||||
class Jetty9Jdk18 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.4.39", jdk = "19")
|
||||
class Jetty9Jdk19 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.4.39", jdk = "20")
|
||||
class Jetty9Jdk20 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.4.39", jdk = "8-openj9")
|
||||
class Jetty9Jdk8Openj9 extends JettySmokeTest {
|
||||
}
|
||||
|
|
@ -60,15 +59,14 @@ class Jetty10Jdk11 extends JettySmokeTest {
|
|||
class Jetty10Jdk17 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
// TODO (trask) remove Java 18 test once Java 19 is GA
|
||||
@AppServer(version = "10.0.7", jdk = "18")
|
||||
class Jetty10Jdk18 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.7", jdk = "19")
|
||||
class Jetty10Jdk19 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.7", jdk = "20")
|
||||
class Jetty10Jdk20 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.7", jdk = "11-openj9")
|
||||
class Jetty10Jdk11Openj9 extends JettySmokeTest {
|
||||
}
|
||||
|
|
@ -85,15 +83,14 @@ class Jetty11Jdk11 extends JettySmokeTest {
|
|||
class Jetty11Jdk17 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
// TODO (trask) remove Java 18 test once Java 19 is GA
|
||||
@AppServer(version = "11.0.7", jdk = "18")
|
||||
class Jetty11Jdk18 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "11.0.7", jdk = "19")
|
||||
class Jetty11Jdk19 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "11.0.7", jdk = "20")
|
||||
class Jetty11Jdk20 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "11.0.7", jdk = "11-openj9")
|
||||
class Jetty11Jdk11Openj9 extends JettySmokeTest {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,15 +39,14 @@ class Tomcat8Jdk11 extends TomcatSmokeTest {
|
|||
class Tomcat8Jdk17 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
// TODO (trask) remove Java 18 test once Java 19 is GA
|
||||
@AppServer(version = "8.5.72", jdk = "18")
|
||||
class Tomcat8Jdk18 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.5.72", jdk = "19")
|
||||
class Tomcat8Jdk19 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.5.72", jdk = "20")
|
||||
class Tomcat8Jdk20 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.5.72", jdk = "8-openj9")
|
||||
class Tomcat8Jdk8Openj9 extends TomcatSmokeTest {
|
||||
}
|
||||
|
|
@ -68,15 +67,14 @@ class Tomcat9Jdk11 extends TomcatSmokeTest {
|
|||
class Tomcat9Jdk17 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
// TODO (trask) remove Java 18 test once Java 19 is GA
|
||||
@AppServer(version = "9.0.54", jdk = "18")
|
||||
class Tomcat9Jdk18 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.54", jdk = "19")
|
||||
class Tomcat9Jdk19 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.54", jdk = "20")
|
||||
class Tomcat9Jdk20 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.54", jdk = "8-openj9")
|
||||
class Tomcat9Jdk8Openj9 extends TomcatSmokeTest {
|
||||
}
|
||||
|
|
@ -97,15 +95,14 @@ class Tomcat10Jdk11 extends TomcatSmokeTest {
|
|||
class Tomcat10Jdk17 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
// TODO (trask) remove Java 18 test once Java 19 is GA
|
||||
@AppServer(version = "10.0.12", jdk = "18")
|
||||
class Tomcat10Jdk18 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.12", jdk = "19")
|
||||
class Tomcat10Jdk19 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.12", jdk = "20")
|
||||
class Tomcat10Jdk20 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.12", jdk = "8-openj9")
|
||||
class Tomcat10Jdk8Openj9 extends TomcatSmokeTest {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,15 +56,14 @@ class Tomee8Jdk11 extends TomeeSmokeTest {
|
|||
class Tomee8Jdk17 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
// TODO (trask) remove Java 18 test once Java 19 is GA
|
||||
@AppServer(version = "8.0.8", jdk = "18")
|
||||
class Tomee8Jdk18 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.0.8", jdk = "19")
|
||||
class Tomee8Jdk19 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.0.8", jdk = "20")
|
||||
class Tomee8Jdk20 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.0.8", jdk = "8-openj9")
|
||||
class Tomee8Jdk8Openj9 extends TomeeSmokeTest {
|
||||
}
|
||||
|
|
@ -89,15 +88,14 @@ class Tomee9Jdk11 extends TomeeSmokeTest {
|
|||
class Tomee9Jdk17 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
// TODO (trask) remove Java 18 test once Java 19 is GA
|
||||
@AppServer(version = "9.0.0-M7", jdk = "18")
|
||||
class Tomee9Jdk18 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.0-M7", jdk = "19")
|
||||
class Tomee9Jdk19 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.0-M7", jdk = "20")
|
||||
class Tomee9Jdk20 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.0-M7", jdk = "8-openj9")
|
||||
class Tomee9Jdk8Openj9 extends TomeeSmokeTest {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,13 +72,12 @@ class Wildfly17Jdk11 extends WildflySmokeTest {
|
|||
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 WildflyJdk8SmokeTest {
|
||||
@AppServer(version = "17.0.1.Final", jdk = "19")
|
||||
class Wildfly17Jdk19 extends WildflyJdk8SmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "17.0.1.Final", jdk = "19")
|
||||
class Wildfly17Jdk19 extends WildflySmokeTest {
|
||||
@AppServer(version = "17.0.1.Final", jdk = "20")
|
||||
class Wildfly17Jdk20 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "21.0.0.Final", jdk = "8")
|
||||
|
|
@ -93,13 +92,12 @@ class Wildfly21Jdk11 extends WildflySmokeTest {
|
|||
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 WildflyJdk8SmokeTest {
|
||||
@AppServer(version = "21.0.0.Final", jdk = "19")
|
||||
class Wildfly21Jdk19 extends WildflyJdk8SmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "21.0.0.Final", jdk = "19")
|
||||
class Wildfly21Jdk19 extends WildflySmokeTest {
|
||||
@AppServer(version = "21.0.0.Final", jdk = "20")
|
||||
class Wildfly21Jdk20 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "25.0.1.Final", jdk = "8")
|
||||
|
|
@ -114,13 +112,12 @@ class Wildfly25Jdk11 extends WildflySmokeTest {
|
|||
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 WildflyJdk8SmokeTest {
|
||||
@AppServer(version = "25.0.1.Final", jdk = "19")
|
||||
class Wildfly25Jdk19 extends WildflyJdk8SmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "25.0.1.Final", jdk = "19")
|
||||
class Wildfly25Jdk19 extends WildflySmokeTest {
|
||||
@AppServer(version = "25.0.1.Final", jdk = "20")
|
||||
class Wildfly25Jdk20 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "17.0.1.Final", jdk = "8-openj9")
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ public class LinuxTestContainerManager extends AbstractTestContainerManager {
|
|||
backend =
|
||||
new GenericContainer<>(
|
||||
DockerImageName.parse(
|
||||
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20220411.2147767274"))
|
||||
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20221127.3559314891"))
|
||||
.withExposedPorts(BACKEND_PORT)
|
||||
.withEnv("JAVA_TOOL_OPTIONS", "-Xmx128m")
|
||||
.waitingFor(Wait.forHttp("/health").forPort(BACKEND_PORT))
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ public class WindowsTestContainerManager extends AbstractTestContainerManager {
|
|||
.getId();
|
||||
|
||||
String backendImageName =
|
||||
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend-windows:20220411.2147767274";
|
||||
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend-windows:20221127.3559314891";
|
||||
if (!imageExists(backendImageName)) {
|
||||
pullImage(backendImageName);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue