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

[WFLY-18409][WFLY-18633][WFLY-19810] #971

Merged
merged 3 commits into from
Oct 30, 2024
Merged

[WFLY-18409][WFLY-18633][WFLY-19810] #971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0672d2
[WFLY-18633] moves to parent 9, which no longer has openshift profile
emmartins Oct 28, 2024
82ceea0
[WFLY-19810] never deploys quickstarts at root web context
emmartins Oct 29, 2024
badf725
moves helm carts back to main branch
emmartins Oct 29, 2024
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
20 changes: 9 additions & 11 deletions .github/workflows/quickstart_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Abstract CI for a specific quickstart
# If you are updating this please note that there are exceptions not using this: ejb-txn-remote-call

name: WildFly Quickstart CI

on:
Expand Down Expand Up @@ -37,11 +40,6 @@ on:
required: false
default: '"ubuntu-latest", "windows-latest"'
type: string
SERVER_PROVISIONING_SERVER_HOST:
description: 'the server.host arg to be used when testing server provisioning with the mvn verify command'
required: false
default: 'http://localhost:8080'
type: string
EXTRA_RUN_ARGS:
description: 'optional args to be passed when running the quickstart'
required: false
Expand Down Expand Up @@ -122,7 +120,7 @@ jobs:
echo "Starting provisioned server..."
mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start -DjbossHome=${{ inputs.DEPLOYMENT_DIR }}/target/server -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }}
echo "Testing provisioned server..."
mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing
mvn -fae verify -Pintegration-testing
echo "Shutting down provisioned server..."
mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown
shell: bash
Expand All @@ -136,7 +134,7 @@ jobs:
echo "Starting bootable jar..."
mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start-jar -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }}
echo "Testing bootable jar..."
mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing
mvn -fae verify -Pintegration-testing
echo "Shutting down bootable jar..."
mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown
shell: bash
Expand All @@ -145,7 +143,7 @@ jobs:
run: |
cd quickstarts
cd ${{ inputs.QUICKSTART_PATH }}
mvn -fae clean package -Popenshift
mvn -fae clean ${{ inputs.MVN_COMMAND }} -Popenshift
shell: bash
- name: Run after script
env:
Expand Down Expand Up @@ -229,7 +227,7 @@ jobs:
echo "Starting provisioned server..."
mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start -DjbossHome=${{ inputs.DEPLOYMENT_DIR }}/target/server -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
echo "Testing provisioned server..."
mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
mvn -fae verify -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
echo "Shutting down provisioned server..."
mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
shell: bash
Expand All @@ -243,7 +241,7 @@ jobs:
echo "Starting bootable jar..."
mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start-jar -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
echo "Testing bootable jar..."
mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
mvn -fae verify -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
echo "Shutting down bootable jar..."
mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
shell: bash
Expand All @@ -252,7 +250,7 @@ jobs:
run: |
cd quickstarts
cd ${{ inputs.QUICKSTART_PATH }}
mvn -fae clean package -Popenshift -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
mvn -fae clean ${{ inputs.MVN_COMMAND }} -Popenshift -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
shell: bash
- name: Run after script
env:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/quickstart_ejb-txn-remote-call_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ jobs:
mvn wildfly:start -Pprovisioned-server -Djboss-as.home=target/server3 -Dwildfly.port=10190 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}}
echo "Testing provisioned server..."
cd ../client
mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8080/client -Pintegration-testing
mvn -fae verify -Pintegration-testing
cd ../server
mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8180/server -Pintegration-testing
mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8280/server -Pintegration-testing
mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8180 -Pintegration-testing
mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8280 -Pintegration-testing
echo "Shutting down provisioned server..."
cd ../client
mvn wildfly:shutdown
Expand Down Expand Up @@ -200,10 +200,10 @@ jobs:
mvn wildfly:start -Pprovisioned-server -Djboss-as.home=target/server3 -Dwildfly.port=10190 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
echo "Testing provisioned server..."
cd ../client
mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8080/client -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
mvn -fae verify -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
cd ../server
mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8180/server -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8280/server -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8180 -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8280 -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
echo "Shutting down provisioned server..."
cd ../client
mvn wildfly:shutdown -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/quickstart_helloworld-mutual-ssl-secured_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ jobs:
uses: ./.github/workflows/quickstart_ci.yml
with:
QUICKSTART_PATH: helloworld-mutual-ssl-secured
SERVER_PROVISIONING_SERVER_HOST: https://localhost:8443/
TEST_PROVISIONED_SERVER: true
TEST_OPENSHIFT: false
1 change: 0 additions & 1 deletion .github/workflows/quickstart_helloworld-mutual-ssl_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ jobs:
uses: ./.github/workflows/quickstart_ci.yml
with:
QUICKSTART_PATH: helloworld-mutual-ssl
SERVER_PROVISIONING_SERVER_HOST: https://localhost:8443/
TEST_PROVISIONED_SERVER: true
TEST_OPENSHIFT: false
2 changes: 1 addition & 1 deletion batch-processing/charts/helm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
build:
uri: https://github.com/wildfly/quickstart.git
ref: 34.x
ref: main
contextDir: batch-processing
deploy:
replicas: 1
25 changes: 14 additions & 11 deletions batch-processing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
Maintain separation between the artifact id and the version to help prevent
merge conflicts between commits changing the GA and those changing the V.
-->
<version>8</version>
<version>9</version>
<relativePath/>
</parent>

Expand Down Expand Up @@ -180,6 +180,8 @@
</dependencies>

<build>
<!-- Set the name of the WAR, used as the context root when the app is deployed. -->
<finalName>${project.artifactId}</finalName>
<pluginManagement>
<plugins>
<plugin>
Expand All @@ -206,11 +208,6 @@
<addOn>h2-database:default</addOn>
</addOns>
</discover-provisioning-info>
<!--
Rename the output war to ROOT.war before adding it to the server, so that the
application is deployed in the root web context.
-->
<name>ROOT.war</name>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -238,11 +235,6 @@
<addOn>h2-database:default</addOn>
</addOns>
</discover-provisioning-info>
<!--
The parent POM's 'openshift' profile renames the output archive to ROOT.war so that the
application is deployed in the root web context. Add ROOT.war to the server.
-->
<filename>ROOT.war</filename>
</configuration>
<executions>
<execution>
Expand All @@ -252,6 +244,17 @@
</execution>
</executions>
</plugin>
<!-- do not attach sources to openshift deployments -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
Expand Down
4 changes: 2 additions & 2 deletions batch-processing/src/test/java/org/wildfly/quickstarts/batch/BasicRuntimeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*/
public class BasicRuntimeIT {

private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/batch-processing";
private static final String DEFAULT_SERVER_HOST = "http://localhost:8080";

@Test
public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException {
Expand All @@ -45,7 +45,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti
serverHost = DEFAULT_SERVER_HOST;
}
final HttpRequest request = HttpRequest.newBuilder()
.uri(new URI(serverHost+"/"))
.uri(new URI(serverHost+"/batch-processing"))
.GET()
.build();
final HttpClient client = HttpClient.newBuilder()
Expand Down
2 changes: 1 addition & 1 deletion bmt/charts/helm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
build:
uri: https://github.com/wildfly/quickstart.git
ref: 34.x
ref: main
contextDir: bmt
deploy:
replicas: 1
25 changes: 14 additions & 11 deletions bmt/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
Maintain separation between the artifact id and the version to help prevent
merge conflicts between commits changing the GA and those changing the V.
-->
<version>8</version>
<version>9</version>
<relativePath/>
</parent>

Expand Down Expand Up @@ -121,6 +121,8 @@
</dependencies>

<build>
<!-- Set the name of the WAR, used as the context root when the app is deployed. -->
<finalName>${project.artifactId}</finalName>
<pluginManagement>
<plugins>
<plugin>
Expand Down Expand Up @@ -148,11 +150,6 @@
<addOn>h2-database:default</addOn>
</addOns>
</discover-provisioning-info>
<!--
Rename the output war to ROOT.war before adding it to the server, so that the
application is deployed in the root web context.
-->
<name>ROOT.war</name>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -181,11 +178,6 @@
<addOn>h2-database:default</addOn>
</addOns>
</discover-provisioning-info>
<!--
The parent POM's 'openshift' profile renames the output archive to ROOT.war so that the
application is deployed in the root web context. Add ROOT.war to the server.
-->
<filename>ROOT.war</filename>
</configuration>
<executions>
<execution>
Expand All @@ -195,6 +187,17 @@
</execution>
</executions>
</plugin>
<!-- do not attach sources to openshift deployments -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
Expand Down
4 changes: 2 additions & 2 deletions bmt/src/test/java/org/wildfly/quickstarts/cmt/BasicRuntimeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*/
public class BasicRuntimeIT {

private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/bmt";
private static final String DEFAULT_SERVER_HOST = "http://localhost:8080";

@Test
public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException {
Expand All @@ -45,7 +45,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti
serverHost = DEFAULT_SERVER_HOST;
}
final HttpRequest request = HttpRequest.newBuilder()
.uri(new URI(serverHost+"/BMT"))
.uri(new URI(serverHost+"/bmt/BMT"))
.GET()
.build();
final HttpClient client = HttpClient.newBuilder()
Expand Down
2 changes: 1 addition & 1 deletion cmt/charts/helm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
build:
uri: https://github.com/wildfly/quickstart.git
ref: 34.x
ref: main
contextDir: cmt
deploy:
replicas: 1
25 changes: 14 additions & 11 deletions cmt/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
Maintain separation between the artifact id and the version to help prevent
merge conflicts between commits changing the GA and those changing the V.
-->
<version>8</version>
<version>9</version>
<relativePath/>
</parent>
<artifactId>cmt</artifactId>
Expand Down Expand Up @@ -125,6 +125,8 @@


<build>
<!-- Set the name of the WAR, used as the context root when the app is deployed. -->
<finalName>${project.artifactId}</finalName>
<pluginManagement>
<plugins>
<plugin>
Expand Down Expand Up @@ -152,11 +154,6 @@
<addOn>h2-database:default</addOn>
</addOns>
</discover-provisioning-info>
<!--
Rename the output war to ROOT.war before adding it to the server, so that the
application is deployed in the root web context.
-->
<name>ROOT.war</name>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -185,11 +182,6 @@
<addOn>h2-database:default</addOn>
</addOns>
</discover-provisioning-info>
<!--
The parent POM's 'openshift' profile renames the output archive to ROOT.war so that the
application is deployed in the root web context. Add ROOT.war to the server.
-->
<filename>ROOT.war</filename>
</configuration>
<executions>
<execution>
Expand All @@ -199,6 +191,17 @@
</execution>
</executions>
</plugin>
<!-- do not attach sources to openshift deployments -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
Expand Down
3 changes: 2 additions & 1 deletion cmt/src/test/java/org/jboss/as/quickstarts/cmt/CustomerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ public class CustomerIT {
protected URI getHTTPEndpoint(String path) {
String host = getServerHost();
if (host == null) {
host = "http://localhost:8080/cmt";
host = "http://localhost:8080";
}
host += "/cmt";
try {
return new URI(host + path);
} catch (URISyntaxException ex) {
Expand Down
4 changes: 2 additions & 2 deletions cmt/src/test/java/org/wildfly/quickstarts/cmt/BasicRuntimeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*/
public class BasicRuntimeIT {

private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/cmt";
private static final String DEFAULT_SERVER_HOST = "http://localhost:8080";

@Test
public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException {
Expand All @@ -45,7 +45,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti
serverHost = DEFAULT_SERVER_HOST;
}
final HttpRequest request = HttpRequest.newBuilder()
.uri(new URI(serverHost+"/"))
.uri(new URI(serverHost+"/cmt"))
.GET()
.build();
final HttpClient client = HttpClient.newBuilder()
Expand Down
2 changes: 1 addition & 1 deletion ee-security/charts/helm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
build:
uri: https://github.com/wildfly/quickstart.git
ref: 34.x
ref: main
contextDir: ee-security
deploy:
replicas: 1
Loading
Loading