Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Windows smoke tests for WildFly #92

Merged
merged 2 commits into from
Jan 26, 2021
Merged

Windows smoke tests for WildFly #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3921d1d
Add WildFly Windows images and smoke tests.
agoallikmaa Jan 25, 2021
7e53478
Added OpenLiberty Windows test images
agoallikmaa Jan 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions matrix/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ def windowsTargets = [
],
"payara": [
"5.2020.6": ["8", "11"]
],
"wildfly" : [
"13.0.0.Final": ["8"],
"17.0.1.Final": ["8", "11"],
"21.0.0.Final": ["8", "11"]
],
"openliberty" : [
[version: "20.0.0.12", release: "2020-11-11_0736"]: ["8", "11", "15"]
]
]

Expand Down
12 changes: 12 additions & 0 deletions matrix/src/main/docker/openliberty/server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<server description="Sample Liberty server">
<variable name="default.http.port" defaultValue="8080"/>

<featureManager>
<feature>javaee-8.0</feature>
</featureManager>

<webApplication location="app.war" contextRoot="/app" />
<mpMetrics authentication="false"/>

<httpEndpoint host="*" httpPort="${default.http.port}" id="defaultHttpEndpoint"/>
</server>
20 changes: 20 additions & 0 deletions matrix/src/openliberty.windows.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
ARG jdk
ARG version
ARG release

# Unzip in a separate container so that zip file layer is not part of final image
FROM mcr.microsoft.com/windows/servercore:1809 as builder
ARG version
ARG release
ADD https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/release/${release}/openliberty-${version}.zip /server.zip
RUN ["powershell", "-Command", "expand-archive -Path /server.zip -DestinationPath /server"]

FROM winamd64/openjdk:${jdk}-jdk-windowsservercore-1809
ARG version
# Make /server the base directory to simplify all further paths
COPY --from=builder /server/wlp /server
COPY app.war /server/usr/servers/defaultServer/apps/
COPY server.xml /server/usr/servers/defaultServer/

WORKDIR /server/bin
CMD /server/bin/server.bat run defaultServer
16 changes: 16 additions & 0 deletions matrix/src/wildfly.windows.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
ARG jdk
ARG version

# Unzip in a separate container so that zip file layer is not part of final image
FROM mcr.microsoft.com/windows/servercore:1809 as builder
ARG version
ADD http://download.jboss.org/wildfly/${version}/wildfly-${version}.zip /server.zip
RUN ["powershell", "-Command", "expand-archive -Path /server.zip -DestinationPath /server"]

FROM winamd64/openjdk:${jdk}-jdk-windowsservercore-1809
ARG version
# Make /server the base directory to simplify all further paths
COPY --from=builder /server/wildfly-${version} /server
COPY app.war /server/standalone/deployments/
WORKDIR /server/bin
CMD /server/bin/standalone.bat -b 0.0.0.0
10 changes: 10 additions & 0 deletions smoke-tests/src/test/java/com/splunk/opentelemetry/LibertySmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.splunk.opentelemetry;

import static com.splunk.opentelemetry.helper.TestImage.linuxImage;
import static com.splunk.opentelemetry.helper.TestImage.proprietaryWindowsImage;
import static org.junit.jupiter.params.provider.Arguments.arguments;

import com.splunk.opentelemetry.helper.TestImage;
Expand Down Expand Up @@ -56,6 +57,15 @@ private static Stream<Arguments> supportedConfigurations() {
arguments(
linuxImage(
"ghcr.io/open-telemetry/java-test-containers:liberty-20.0.0.12-jdk15-jdk-openj9-20201209.410207048"),
LIBERTY20_SERVER_ATTRIBUTES),
arguments(
proprietaryWindowsImage("splunk-openliberty:20.0.0.12-jdk8-windows"),
LIBERTY20_SERVER_ATTRIBUTES),
arguments(
proprietaryWindowsImage("splunk-openliberty:20.0.0.12-jdk11-windows"),
LIBERTY20_SERVER_ATTRIBUTES),
arguments(
proprietaryWindowsImage("splunk-openliberty:20.0.0.12-jdk15-windows"),
LIBERTY20_SERVER_ATTRIBUTES));
}

Expand Down
16 changes: 16 additions & 0 deletions smoke-tests/src/test/java/com/splunk/opentelemetry/WildFlySmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.splunk.opentelemetry;

import static com.splunk.opentelemetry.helper.TestImage.linuxImage;
import static com.splunk.opentelemetry.helper.TestImage.proprietaryWindowsImage;
import static org.junit.jupiter.params.provider.Arguments.arguments;

import com.splunk.opentelemetry.helper.TestImage;
Expand Down Expand Up @@ -59,6 +60,21 @@ private static Stream<Arguments> supportedConfigurations() {
arguments(
linuxImage(
"ghcr.io/open-telemetry/java-test-containers:wildfly-21.0.0.Final-jdk11-20201207.405832649"),
WILDFLY_21_SERVER_ATTRIBUTES),
arguments(
proprietaryWindowsImage("splunk-wildfly:13.0.0.Final-jdk8-windows"),
WILDFLY_13_SERVER_ATTRIBUTES),
arguments(
proprietaryWindowsImage("splunk-wildfly:17.0.1.Final-jdk8-windows"),
WILDFLY_17_SERVER_ATTRIBUTES),
arguments(
proprietaryWindowsImage("splunk-wildfly:17.0.1.Final-jdk11-windows"),
WILDFLY_17_SERVER_ATTRIBUTES),
arguments(
proprietaryWindowsImage("splunk-wildfly:21.0.0.Final-jdk8-windows"),
WILDFLY_21_SERVER_ATTRIBUTES),
arguments(
proprietaryWindowsImage("splunk-wildfly:21.0.0.Final-jdk11-windows"),
WILDFLY_21_SERVER_ATTRIBUTES));
}

Expand Down