diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 186e15e7..edd7438f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -109,21 +109,105 @@ jobs: docker image ls docker inspect ${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} docker run --rm ${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} bash - - name: Behave Tests JDK11, must remove tests that can't run on Java 11 - if: matrix.jdk == 'jdk11' + - name: Behave Tests basic run: | . ~/cekit/bin/activate pushd wildfly-builder-image - rm -rf tests/features/no-jdk11-* - cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave + cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave --include-re basic > test-logs-basic-${{ matrix.os }}-${{ matrix.jdk }}.txt 2>&1 popd - - name: Behave Tests JDK + docker system prune -f + - name: Behave Tests datasources + run: | + . ~/cekit/bin/activate + pushd wildfly-builder-image + cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave --include-re datasources > test-logs-datasources-${{ matrix.os }}-${{ matrix.jdk }}.txt 2>&1 + popd + docker system prune -f + - name: Behave Tests extensions + run: | + . ~/cekit/bin/activate + pushd wildfly-builder-image + cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave --include-re extensions > test-logs-extensions-${{ matrix.os }}-${{ matrix.jdk }}.txt 2>&1 + popd + docker system prune -f + - name: Behave Tests jgroups + run: | + . ~/cekit/bin/activate + pushd wildfly-builder-image + cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave --include-re jgroups > test-logs-jgroups-${{ matrix.os }}-${{ matrix.jdk }}.txt 2>&1 + popd + docker system prune -f + - name: Behave Tests keycloak + run: | + . ~/cekit/bin/activate + pushd wildfly-builder-image + cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave --include-re keycloak > test-logs-keycloak-${{ matrix.os }}-${{ matrix.jdk }}.txt 2>&1 + popd + docker system prune -f + - name: Behave Tests legacy-elytron + run: | + . ~/cekit/bin/activate + pushd wildfly-builder-image + cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave --include-re legacy-elytron > test-logs-legacy-elytron-${{ matrix.os }}-${{ matrix.jdk }}.txt 2>&1 + popd + docker system prune -f + - name: Behave Tests legacy-s2i + run: | + . ~/cekit/bin/activate + pushd wildfly-builder-image + cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave --include-re legacy-s2i > test-logs-legacy-s2i-${{ matrix.os }}-${{ matrix.jdk }}.txt 2>&1 + popd + docker system prune -f + - name: Behave Tests messaging + run: | + . ~/cekit/bin/activate + pushd wildfly-builder-image + cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave --include-re messaging > test-logs-messaging-${{ matrix.os }}-${{ matrix.jdk }}.txt 2>&1 + popd + docker system prune -f + - name: Behave Tests for jdk17+ if: matrix.jdk != 'jdk11' run: | . ~/cekit/bin/activate pushd wildfly-builder-image - cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave + cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave --include-re no-jdk11 > test-logs-no-jdk11-${{ matrix.os }}-${{ matrix.jdk }}.txt 2>&1 + popd + docker system prune -f + - name: Behave Tests oidc + run: | + . ~/cekit/bin/activate + pushd wildfly-builder-image + cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave --include-re oidc > test-logs-oidc-${{ matrix.os }}-${{ matrix.jdk }}.txt 2>&1 popd + docker system prune -f + - name: Behave Tests s2i + run: | + . ~/cekit/bin/activate + pushd wildfly-builder-image + cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave --include-re s2i-tests > test-logs-s2i-tests-${{ matrix.os }}-${{ matrix.jdk }}.txt 2>&1 + popd + docker system prune -f + - name: Behave Tests server_builder + run: | + . ~/cekit/bin/activate + pushd wildfly-builder-image + cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave --include-re server_builder > test-logs-server_builder-${{ matrix.os }}-${{ matrix.jdk }}.txt 2>&1 + popd + docker system prune -f + - name: Behave Tests stability + run: | + . ~/cekit/bin/activate + pushd wildfly-builder-image + cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave --include-re stability > test-logs-stability-${{ matrix.os }}-${{ matrix.jdk }}.txt 2>&1 + popd + docker system prune -f + - name: Behave Tests vanilla-basic + run: | + . ~/cekit/bin/activate + pushd wildfly-builder-image + cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave --include-re vanilla-basic > test-logs-vanilla-basic-${{ matrix.os }}-${{ matrix.jdk }}.txt 2>&1 + popd + docker system prune -f - name: Additional Tests run: | export IMAGE_VERSION=${{ env.WILDFLY_IMAGE_VERSION }} @@ -131,6 +215,14 @@ jobs: export RUNTIME_IMAGE_NAME=${{ env.WILDFLY_S2I_RUNTIME_IMAGE }} . ~/cekit/bin/activate ./test/run + - name: Upload Test Reports on Failure + uses: actions/upload-artifact@v3 + if: failure() + with: + name: wildfly-s2i-test-logs-${{ matrix.os }}-${{ matrix.jdk }} + path: | + wildfly-builder-image/test-logs-*.txt + /tmp/*.wfs2i.log - name: Display resources information if: failure() run: | diff --git a/.github/workflows/v2-push.yml b/.github/workflows/v2-push.yml index 2c7b9d0e..d06d64c5 100644 --- a/.github/workflows/v2-push.yml +++ b/.github/workflows/v2-push.yml @@ -97,8 +97,8 @@ jobs: pushd wildfly-runtime-image cekit build --dry-run --overrides=${{ matrix.jdk }}-overrides.yaml docker popd - - name: Add latest image tag, currently JDK17 - if: env.IMPACT_IMAGE == 'true' && matrix.jdk == 'jdk17' + - name: Add latest image tag, currently JDK21 + if: env.IMPACT_IMAGE == 'true' && matrix.jdk == 'jdk21' run: | echo "WILDFLY_IMAGE_TAGS=latest ${{ env.WILDFLY_IMAGE_TAGS }}" >> $GITHUB_ENV - name: Buildah multi archs Builder Build diff --git a/test/run b/test/run index f17854c2..3cc7e5f3 100755 --- a/test/run +++ b/test/run @@ -1,8 +1,8 @@ #!/bin/bash -e SCRIPT_DIR=$(dirname $0) test_dir="$(readlink -zf $(dirname "${BASH_SOURCE[0]}"))" -log_file=$(mktemp -u --suffix=.log) -s2i_log_file=$(mktemp -u --suffix=.log) +log_file=$(mktemp -u --suffix=.wfs2i.log) +s2i_log_file=$(mktemp -u --suffix=.wfs2i.log) cid_file=$(mktemp -u --suffix=.cid) # Since we built the image locally, we don't want S2I attempt to pull diff --git a/test/test-app-keycloak-legacy/.s2i/environment b/test/test-app-keycloak-legacy/.s2i/environment deleted file mode 100644 index 9a2e2368..00000000 --- a/test/test-app-keycloak-legacy/.s2i/environment +++ /dev/null @@ -1 +0,0 @@ -CUSTOM_INSTALL_DIRECTORIES=install-keycloak/target/keycloak-saml diff --git a/test/test-app-keycloak-legacy/app-profile-jee-saml/README.md b/test/test-app-keycloak-legacy/app-profile-jee-saml/README.md deleted file mode 100644 index c4698230..00000000 --- a/test/test-app-keycloak-legacy/app-profile-jee-saml/README.md +++ /dev/null @@ -1,57 +0,0 @@ -It is backward compatible. - -WARNING: The application route must be SSL. - - -First deploy jboss SSO with admin/admin - -- add WildFly realm - -- create User demo, passord demo - -- Add all permissions to the user in role mappping (needed to access the signing certificate). - -- add user role - -- make admin to be user role - -ARTIFACT_DIR: app-profile-saml-jee-jsp/target - -Deployment: - -Env - -SSO_URL=https://keycloak-server-myproject.192.168.42.38.nip.io/auth - -SSO_REALM=WildFly - -SSO_USERNAME=demo - -SSO_PASSWORD=demo - -HOSTNAME_HTTPS=sso-test-myproject.192.168.42.38.nip.io - -SSO_SAML_CERTIFICATE_NAME=app-profile-saml - -SSO_SAML_KEYSTORE=keystore.jks - -SSO_SAML_KEYSTORE_PASSWORD=password - -SSO_SAML_KEYSTORE_DIR=/etc/sso-saml-secret-volume - -SSO_SAML_LOGOUT_PAGE=/index.jsp - -SSO_SECRET=foo - -Deploy apps first, the client will be created in keycloak - -Go to admin console, click the saml client, SAML Keys, export - -Use password for both passwords. Keep JKS and Key alias : app-profile-jee-saml - -Download the keystore. - -Create a secret: oc create secret saml-keystore-secret ~/Downloads/keystore.jks - -Mount the secret as a volume: oc set volume domain/ --add --name=sso-saml-keystore-volume --type=secret --secret-name=saml-keystore-secret --mount-path=/etc/sso-saml-secret-volume -When mounting the volume, the application will be re-deployed taking into account the new mounted volume. \ No newline at end of file diff --git a/test/test-app-keycloak-legacy/app-profile-jee-saml/pom.xml b/test/test-app-keycloak-legacy/app-profile-jee-saml/pom.xml deleted file mode 100644 index d86f5604..00000000 --- a/test/test-app-keycloak-legacy/app-profile-jee-saml/pom.xml +++ /dev/null @@ -1,117 +0,0 @@ - - 4.0.0 - - - org.keycloak.quickstart - keycloak-quickstart-parent - 0.5-SNAPSHOT - - - org.keycloak.quickstart - keycloak-quickstart-app-profile-jee-saml - 0.5-SNAPSHOT - - Keycloak Quickstart App Profile JEE SAML - - - war - - - - - - - - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec - provided - - - org.keycloak - keycloak-core - provided - - - org.keycloak - keycloak-adapter-core - provided - - - org.keycloak - keycloak-saml-adapter-core - provided - - - org.keycloak - keycloak-saml-adapter-api-public - provided - - - org.keycloak - keycloak-adapter-spi - provided - - - - - - app-profile-jee-saml - - - org.apache.maven.plugins - maven-war-plugin - ${version.maven.war.plugin} - - - org.jboss.as.plugins - jboss-as-maven-plugin - - false - - - - org.wildfly.plugins - wildfly-maven-plugin - - false - - - - org.wildfly.plugins - wildfly-maven-plugin - 4.0.0.Final - - - true - - - org.wildfly:wildfly-galleon-pack:26.1.1.Final - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:3.0.0.Final - - - - cloud-default-config - - - ${plugin.fork.embedded} - - - - - - package - - - - - - - diff --git a/test/test-app-keycloak-legacy/app-profile-jee-saml/src/main/java/org/keycloak/quickstart/profilejee/Controller.java b/test/test-app-keycloak-legacy/app-profile-jee-saml/src/main/java/org/keycloak/quickstart/profilejee/Controller.java deleted file mode 100644 index 97809709..00000000 --- a/test/test-app-keycloak-legacy/app-profile-jee-saml/src/main/java/org/keycloak/quickstart/profilejee/Controller.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2016, Red Hat, Inc. and/or its affiliates, and individual - * contributors by the @authors tag. See the copyright.txt in the - * distribution for a full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.keycloak.quickstart.profilejee; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import org.keycloak.adapters.saml.SamlDeploymentContext; -import org.keycloak.adapters.saml.SamlPrincipal; -import org.keycloak.adapters.saml.SamlSession; -import org.keycloak.common.util.KeycloakUriBuilder; -import org.keycloak.constants.ServiceUrlConstants; - -/** - * Controller simplifies access to the server environment from the JSP. - * - * @author Stan Silvert ssilvert@redhat.com (C) 2015 Red Hat Inc. - */ -public class Controller { - - public String getFirstName(HttpServletRequest req) { - return getFriendlyAttrib(req, "givenName"); - } - - public String getLastName(HttpServletRequest req) { - return getFriendlyAttrib(req, "surname"); - } - - public String getEmail(HttpServletRequest req) { - return getFriendlyAttrib(req, "email"); - } - - public String getUsername(HttpServletRequest req) { - return getAccount(req).getName(); - } - - private String getFriendlyAttrib(HttpServletRequest req, String attribName) { - SamlPrincipal principal = getAccount(req); - return principal.getFriendlyAttribute(attribName); - } - - private SamlPrincipal getAccount(HttpServletRequest req) { - SamlPrincipal principal = (SamlPrincipal)req.getUserPrincipal(); - return principal; - } - - public boolean isLoggedIn(HttpServletRequest req) { - return getAccount(req) != null; - } - - public String getAccountUri(HttpServletRequest req) { - String serverPath = findKeycloakServerPath(req); - String realm = findRealmName(req); - return KeycloakUriBuilder.fromUri(serverPath).path(ServiceUrlConstants.ACCOUNT_SERVICE_PATH) - .queryParam("referrer", "app-profile-saml").build(realm).toString(); - } - - // HACK: This is a really bad way to find the realm name, but I can't - // figure out a better way to do it with the SAML adapter. It parses - // the URL specified in keycloak-saml.xml - private String findRealmName(HttpServletRequest req) { - String bindingUrl = getBindingUrl(req); - // bindingUrl looks like http://localhost:8080/auth/realms/master/protocol/saml - int beginIndex = bindingUrl.indexOf("/realms/") + "/realms/".length(); - return bindingUrl.substring(beginIndex, bindingUrl.indexOf('/', beginIndex)); - } - - private String findKeycloakServerPath(HttpServletRequest req) { - String bindingUrl = getBindingUrl(req); - // bindingUrl looks like http://localhost:8080/auth/realms/master/protocol/saml - return bindingUrl.substring(0, bindingUrl.indexOf("/auth")) + "/auth"; - } - - private String getBindingUrl(HttpServletRequest req) { - SamlDeploymentContext ctx = (SamlDeploymentContext)req.getServletContext().getAttribute(SamlDeploymentContext.class.getName()); - return ctx.resolveDeployment(null).getIDP().getSingleSignOnService().getRequestBindingUrl(); - } - -} diff --git a/test/test-app-keycloak-legacy/app-profile-jee-saml/src/main/webapp/WEB-INF/web.xml b/test/test-app-keycloak-legacy/app-profile-jee-saml/src/main/webapp/WEB-INF/web.xml deleted file mode 100755 index 5fc31257..00000000 --- a/test/test-app-keycloak-legacy/app-profile-jee-saml/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - app - /profile.jsp - - - user - - - - - KEYCLOAK-SAML - - - - user - - diff --git a/test/test-app-keycloak-legacy/app-profile-jee-saml/src/main/webapp/index.jsp b/test/test-app-keycloak-legacy/app-profile-jee-saml/src/main/webapp/index.jsp deleted file mode 100644 index 6df7f76c..00000000 --- a/test/test-app-keycloak-legacy/app-profile-jee-saml/src/main/webapp/index.jsp +++ /dev/null @@ -1,46 +0,0 @@ - - -<%@page contentType="text/html" pageEncoding="ISO-8859-1"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - RH-SSO Example App - - - - - - - - - - - -
-
- -
- -
-
Please login
-
-
- - diff --git a/test/test-app-keycloak-legacy/app-profile-jee-saml/src/main/webapp/profile.jsp b/test/test-app-keycloak-legacy/app-profile-jee-saml/src/main/webapp/profile.jsp deleted file mode 100644 index 072ed97c..00000000 --- a/test/test-app-keycloak-legacy/app-profile-jee-saml/src/main/webapp/profile.jsp +++ /dev/null @@ -1,62 +0,0 @@ - - -<%@page contentType="text/html" pageEncoding="ISO-8859-1"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - RH-SSO SAML Example App - - - - - - - -
-
- - -
- -
-
- - - - - - - - - - - - - - - - - -
First name${controller.getFirstName(req)}
Last name${controller.getLastName(req)}
Username${controller.getUsername(req)}
Email${controller.getEmail(req)}
-
-
-
- - diff --git a/test/test-app-keycloak-legacy/app-profile-jee-saml/src/main/webapp/styles.css b/test/test-app-keycloak-legacy/app-profile-jee-saml/src/main/webapp/styles.css deleted file mode 100644 index 40faeedd..00000000 --- a/test/test-app-keycloak-legacy/app-profile-jee-saml/src/main/webapp/styles.css +++ /dev/null @@ -1,112 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2016, Red Hat, Inc. and/or its affiliates, and individual - * contributors by the @authors tag. See the copyright.txt in the - * distribution for a full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -body { - background-color: #333; - font-family: sans-serif; - font-size: 30px; -} - -button { - font-family: sans-serif; - font-size: 30px; - width: 200px; - - background-color: #0085cf; - background-image: linear-gradient(to bottom, #00a8e1 0%, #0085cf 100%); - background-repeat: repeat-x; - - border: 2px solid #ccc; - color: #fff; - - text-transform: uppercase; - - -webkit-box-shadow: 2px 2px 10px 0px rgba(0,0,0,0.5); - -moz-box-shadow: 2px 2px 10px 0px rgba(0,0,0,0.5); - box-shadow: 2px 2px 10px 0px rgba(0,0,0,0.5); -} - -button:hover { - background-color: #006ba6; - background-image: none; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -hr { - border: none; - background-color: #eee; - height: 10px; -} - -.menu { - padding: 10px; - margin-bottom: 10px; -} - -.content { - background-color: #eee; - border: 1px solid #ccc; - padding: 10px; - - -webkit-box-shadow: 2px 2px 10px 0px rgba(0,0,0,0.5); - -moz-box-shadow: 2px 2px 10px 0px rgba(0,0,0,0.5); - box-shadow: 2px 2px 10px 0px rgba(0,0,0,0.5); -} - -.content .message { - padding: 10px; - background-color: #fff; - border: 1px solid #ccc; - font-size: 40px; -} - -#token-content { - font-size: 20px; - padding: 5px; - white-space: pre; - text-transform: none; -} - -.wrapper { - position: absolute; - left: 10px; - top: 10px; - bottom: 10px; - right: 10px; -} - -.error { - color: #a21e22; -} - -table { - width: 100%; -} - -tr.even { - background-color: #eee; -} - -td { - padding: 5px; -} - -td.label { - font-weight: bold; - width: 250px; -} diff --git a/test/test-app-keycloak-legacy/install-keycloak/pom.xml b/test/test-app-keycloak-legacy/install-keycloak/pom.xml deleted file mode 100644 index 8be9983b..00000000 --- a/test/test-app-keycloak-legacy/install-keycloak/pom.xml +++ /dev/null @@ -1,71 +0,0 @@ - - 4.0.0 - - Keycloak Quickstart Install keycloak adapters - Keycloak Quickstart Install keycloak adapters - org.keycloak.quickstart - keycloak-quickstart-install - 0.5-SNAPSHOT - pom - - http://keycloak.org - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - - - - - scm:git:git://github.com/keycloak/keycloak-examples.git - scm:git:git@github.com:keycloak/keycloak-examples.git - https://github.com/keycloak/keycloak-examples/tree/master - - - - - - - org.wildfly.plugins - wildfly-maven-plugin - ${version.wildfly.plugin} - - true - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - download-files - package - - run - - - - - - - - - - - - - - - - - - diff --git a/test/test-app-keycloak-legacy/pom.xml b/test/test-app-keycloak-legacy/pom.xml deleted file mode 100644 index 5c873f0b..00000000 --- a/test/test-app-keycloak-legacy/pom.xml +++ /dev/null @@ -1,129 +0,0 @@ - - 4.0.0 - - Keycloak Quickstart Parent - Keycloak Quickstart Parent - org.keycloak.quickstart - keycloak-quickstart-parent - 0.5-SNAPSHOT - pom - - - 3.3.2 - 3.0.12.Final - 1.0.1.Final - 17.0.1 - 4.5.13 - 1.0.2.Final - 11 - 11 - - - http://keycloak.org - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - - - - - scm:git:git://github.com/keycloak/keycloak-examples.git - scm:git:git@github.com:keycloak/keycloak-examples.git - https://github.com/keycloak/keycloak-examples/tree/master - - - - - jboss-releases-repository - JBoss Releases Repository - https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/ - - - - - - - - - - - install-keycloak - app-profile-jee-saml - - - - - - org.jboss.resteasy - jaxrs-api - ${version.resteasy} - - - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec - ${version.jboss.servlet-api} - - - org.keycloak - keycloak-core - ${version.keycloak} - - - org.keycloak - keycloak-adapter-core - ${version.keycloak} - - - org.keycloak - keycloak-saml-adapter-api-public - ${version.keycloak} - - - org.keycloak - keycloak-adapter-spi - ${version.keycloak} - - - org.keycloak - keycloak-saml-adapter-core - ${version.keycloak} - - - org.keycloak - keycloak-adapter-spi - ${version.keycloak} - - - org.apache.httpcomponents - httpclient - ${version.httpclient} - - - - - - - jboss - http://repository.jboss.org/nexus/content/groups/public/ - - - - - - - - org.wildfly.plugins - wildfly-maven-plugin - ${version.wildfly.plugin} - - true - - - - - - diff --git a/test/test-app-keycloak-saml/pom.xml b/test/test-app-keycloak-saml/pom.xml index c283c5e0..b8a32180 100644 --- a/test/test-app-keycloak-saml/pom.xml +++ b/test/test-app-keycloak-saml/pom.xml @@ -13,12 +13,11 @@ 11 11 3.3.2 - - 28.0.1.Final + 32.0.0.Final 5.0.0.Final 7.0.0.Final 10.0.0 - 22.0.1 + 23.0.0 diff --git a/wildfly-builder-image/tests/features/keycloak.feature b/wildfly-builder-image/tests/features/keycloak.feature index 08d75663..6bf8604b 100644 --- a/wildfly-builder-image/tests/features/keycloak.feature +++ b/wildfly-builder-image/tests/features/keycloak.feature @@ -5,7 +5,7 @@ Feature: Keycloak saml tests Given XML namespaces | prefix | url | | ns | urn:jboss:domain:keycloak:1.4 | - Given s2i build http://github.com/jfdenise/wildfly-s2i from test/test-app-keycloak-saml using main + Given s2i build http://github.com/wildfly/wildfly-s2i from test/test-app-keycloak-saml using main | variable | value | Scenario: Enable keycloak automatic registration. diff --git a/wildfly-builder-image/tests/features/no-jdk11-legacy-s2i.feature b/wildfly-builder-image/tests/features/no-jdk11.feature similarity index 100% rename from wildfly-builder-image/tests/features/no-jdk11-legacy-s2i.feature rename to wildfly-builder-image/tests/features/no-jdk11.feature diff --git a/wildfly-builder-image/tests/features/s2i.feature b/wildfly-builder-image/tests/features/s2i-tests.feature similarity index 100% rename from wildfly-builder-image/tests/features/s2i.feature rename to wildfly-builder-image/tests/features/s2i-tests.feature diff --git a/wildfly-builder-image/tests/features/stability.feature b/wildfly-builder-image/tests/features/stability.feature new file mode 100644 index 00000000..2d4f254d --- /dev/null +++ b/wildfly-builder-image/tests/features/stability.feature @@ -0,0 +1,9 @@ +@wildfly/wildfly-s2i +Feature: Wildfly stability related tests + + Scenario: Check that the server starts properly at the preview stability level + Given s2i build http://github.com/wildfly/wildfly-s2i from test/test-app-stability-preview with env and True using main + | variable | value | + | SERVER_ARGS | --stability=preview | + ### PLACEHOLDER FOR CLOUD CUSTOM TESTING ### + Then container log should contain WFLYSRV0025 diff --git a/wildfly-builder-image/tests/features/vanilla-basic.feature b/wildfly-builder-image/tests/features/vanilla.feature similarity index 100% rename from wildfly-builder-image/tests/features/vanilla-basic.feature rename to wildfly-builder-image/tests/features/vanilla.feature