diff --git a/jboss/container/config/7.4/ee-elytron/standalone-openshift.xml b/jboss/container/config/7.4/ee-elytron/standalone-openshift.xml new file mode 100644 index 00000000..bef4acef --- /dev/null +++ b/jboss/container/config/7.4/ee-elytron/standalone-openshift.xml @@ -0,0 +1,563 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.h2.jdbcx.JdbcDataSource + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + jbossws.undefined.host + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jboss/container/eap/galleon/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/feature_groups/os-undertow-elytron.xml b/jboss/container/eap/galleon/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/feature_groups/os-undertow-elytron.xml new file mode 100644 index 00000000..e43ec471 --- /dev/null +++ b/jboss/container/eap/galleon/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/feature_groups/os-undertow-elytron.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/jboss/container/eap/galleon/config/ee/artifacts/opt/jboss/container/eap/galleon/definitions/fat-default-server/provisioning.xml b/jboss/container/eap/galleon/config/ee-common/artifacts/opt/jboss/container/eap/galleon/definitions/fat-default-server/provisioning.xml similarity index 100% rename from jboss/container/eap/galleon/config/ee/artifacts/opt/jboss/container/eap/galleon/definitions/fat-default-server/provisioning.xml rename to jboss/container/eap/galleon/config/ee-common/artifacts/opt/jboss/container/eap/galleon/definitions/fat-default-server/provisioning.xml diff --git a/jboss/container/eap/galleon/config/ee/artifacts/opt/jboss/container/eap/galleon/definitions/slim-default-server/provisioning.xml b/jboss/container/eap/galleon/config/ee-common/artifacts/opt/jboss/container/eap/galleon/definitions/slim-default-server/provisioning.xml similarity index 100% rename from jboss/container/eap/galleon/config/ee/artifacts/opt/jboss/container/eap/galleon/definitions/slim-default-server/provisioning.xml rename to jboss/container/eap/galleon/config/ee-common/artifacts/opt/jboss/container/eap/galleon/definitions/slim-default-server/provisioning.xml diff --git a/jboss/container/eap/galleon/config/ee-common/configure.sh b/jboss/container/eap/galleon/config/ee-common/configure.sh new file mode 100644 index 00000000..7c873982 --- /dev/null +++ b/jboss/container/eap/galleon/config/ee-common/configure.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# Configure module +set -e + +SCRIPT_DIR=$(dirname $0) +ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts + +chown -R jboss:root $SCRIPT_DIR +chmod -R ug+rwX $SCRIPT_DIR + +pushd ${ARTIFACTS_DIR} +cp -pr * / +popd diff --git a/jboss/container/eap/galleon/config/ee-common/module.yaml b/jboss/container/eap/galleon/config/ee-common/module.yaml new file mode 100644 index 00000000..801c3ac8 --- /dev/null +++ b/jboss/container/eap/galleon/config/ee-common/module.yaml @@ -0,0 +1,7 @@ +schema_version: 1 +name: jboss.container.eap.galleon.config.ee.common +version: '1.0' +description: Install Galleon ee default configuration. + +execute: +- script: configure.sh diff --git a/jboss/container/eap/galleon/config/ee-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/configs/standalone/standalone.xml/config.xml b/jboss/container/eap/galleon/config/ee-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/configs/standalone/standalone.xml/config.xml new file mode 100644 index 00000000..27d44f9b --- /dev/null +++ b/jboss/container/eap/galleon/config/ee-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/configs/standalone/standalone.xml/config.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jboss/container/eap/galleon/config/ee-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/layers/standalone/application-security-realm/layer-spec.xml b/jboss/container/eap/galleon/config/ee-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/layers/standalone/application-security-realm/layer-spec.xml new file mode 100644 index 00000000..8fc100a1 --- /dev/null +++ b/jboss/container/eap/galleon/config/ee-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/layers/standalone/application-security-realm/layer-spec.xml @@ -0,0 +1,4 @@ + + + + diff --git a/jboss/container/eap/galleon/config/ee-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/layers/standalone/management-security-realm/layer-spec.xml b/jboss/container/eap/galleon/config/ee-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/layers/standalone/management-security-realm/layer-spec.xml new file mode 100644 index 00000000..794032c5 --- /dev/null +++ b/jboss/container/eap/galleon/config/ee-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/layers/standalone/management-security-realm/layer-spec.xml @@ -0,0 +1,4 @@ + + + + diff --git a/jboss/container/eap/galleon/config/ee-elytron/configure.sh b/jboss/container/eap/galleon/config/ee-elytron/configure.sh new file mode 100644 index 00000000..dbbadb3c --- /dev/null +++ b/jboss/container/eap/galleon/config/ee-elytron/configure.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# Configure module +set -e + +SCRIPT_DIR=$(dirname $0) +ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts + +chown -R jboss:root $SCRIPT_DIR +chmod -R ug+rwX $SCRIPT_DIR + +pushd ${ARTIFACTS_DIR} +cp -pr * / +popd + +# Remove sso content for JDK17 tech preview image. To be removed when supported. +rm "${GALLEON_FP_PATH}/src/main/resources/feature_groups/sso.xml" +rm -r "${GALLEON_FP_PATH}/src/main/resources/layers/standalone/sso" diff --git a/jboss/container/eap/galleon/config/ee-elytron/module.yaml b/jboss/container/eap/galleon/config/ee-elytron/module.yaml new file mode 100644 index 00000000..58fc477b --- /dev/null +++ b/jboss/container/eap/galleon/config/ee-elytron/module.yaml @@ -0,0 +1,11 @@ +schema_version: 1 +name: jboss.container.eap.galleon.config.ee +version: '1.0-elytron' +description: Install Galleon ee default configuration. + +execute: +- script: configure.sh + +modules: + install: + - name: jboss.container.eap.galleon.config.ee.common \ No newline at end of file diff --git a/jboss/container/eap/galleon/config/ee/module.yaml b/jboss/container/eap/galleon/config/ee/module.yaml index bb2b318b..1dc32288 100644 --- a/jboss/container/eap/galleon/config/ee/module.yaml +++ b/jboss/container/eap/galleon/config/ee/module.yaml @@ -5,3 +5,7 @@ description: Install Galleon ee default configuration. execute: - script: configure.sh + +modules: + install: + - name: jboss.container.eap.galleon.config.ee.common \ No newline at end of file diff --git a/jboss/container/eap/launch/added/launch/backward-compatibility.sh b/jboss/container/eap/launch/common/added/launch/backward-compatibility.sh similarity index 100% rename from jboss/container/eap/launch/added/launch/backward-compatibility.sh rename to jboss/container/eap/launch/common/added/launch/backward-compatibility.sh diff --git a/jboss/container/eap/launch/added/launch/passwd.sh b/jboss/container/eap/launch/common/added/launch/passwd.sh similarity index 100% rename from jboss/container/eap/launch/added/launch/passwd.sh rename to jboss/container/eap/launch/common/added/launch/passwd.sh diff --git a/jboss/container/eap/launch/added/openshift-launch.sh b/jboss/container/eap/launch/common/added/openshift-launch.sh similarity index 68% rename from jboss/container/eap/launch/added/openshift-launch.sh rename to jboss/container/eap/launch/common/added/openshift-launch.sh index 33cc30af..a281986a 100755 --- a/jboss/container/eap/launch/added/openshift-launch.sh +++ b/jboss/container/eap/launch/common/added/openshift-launch.sh @@ -5,6 +5,23 @@ echo "`date "+%Y-%m-%d %H:%M:%S"` Launching EAP Server" # Always start sourcing the launch script supplied by wildfly-cekit-modules source ${JBOSS_HOME}/bin/launch/launch.sh +# Append image specific modular options in standalone.conf +SPEC_VERSION="${JAVA_VERSION//1.}" +SPEC_VERSION="${SPEC_VERSION//.*}" +if (( $SPEC_VERSION > 15 )); then + MODULAR_JVM_OPTIONS=`echo $JAVA_OPTS | grep "\-\-add\-modules"` + if [ "x$MODULAR_JVM_OPTIONS" = "x" ]; then + DIRNAME=`dirname "$0"` + marker="#JVM modular options added by openshift startup script" + if ! grep -q "$marker" "$DIRNAME/standalone.conf"; then + jvm_options="$marker +JAVA_OPTS=\"\$JAVA_OPTS --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED\"" + echo "$jvm_options" >> "$DIRNAME/standalone.conf" + fi + fi +fi +# end specific JDK modular options + function runServer() { local instanceDir=$1 launchServer "$JBOSS_HOME/bin/standalone.sh -c standalone-openshift.xml -bmanagement 0.0.0.0 -Djboss.server.data.dir=${instanceDir} -Dwildfly.statistics-enabled=true" diff --git a/jboss/container/eap/launch/added/openshift-migrate.sh b/jboss/container/eap/launch/common/added/openshift-migrate.sh similarity index 100% rename from jboss/container/eap/launch/added/openshift-migrate.sh rename to jboss/container/eap/launch/common/added/openshift-migrate.sh diff --git a/jboss/container/eap/launch/configure.sh b/jboss/container/eap/launch/common/configure.sh similarity index 100% rename from jboss/container/eap/launch/configure.sh rename to jboss/container/eap/launch/common/configure.sh diff --git a/jboss/container/eap/launch/module.yaml b/jboss/container/eap/launch/common/module.yaml similarity index 95% rename from jboss/container/eap/launch/module.yaml rename to jboss/container/eap/launch/common/module.yaml index d4370883..7bf6c99e 100644 --- a/jboss/container/eap/launch/module.yaml +++ b/jboss/container/eap/launch/common/module.yaml @@ -1,5 +1,5 @@ schema_version: 1 -name: jboss.container.eap.launch +name: jboss.container.eap.launch.common version: '1.0' description: Module that enables CLI configuration for standalone-openshift.xml file execute: diff --git a/jboss/container/eap/launch/ee-no-sso/added/launch/launch-config.sh b/jboss/container/eap/launch/ee-no-sso/added/launch/launch-config.sh new file mode 100644 index 00000000..7c698b2f --- /dev/null +++ b/jboss/container/eap/launch/ee-no-sso/added/launch/launch-config.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +# Centralised configuration file to set variables that affect the launch scripts in wildfly-cekit-modules. + +# Scripts that modify the configuration. Either via xml marker replacement or via CLI commands. +# wildfly-cekit-modules will look for each of the listed files and run them if they exist. +CONFIG_SCRIPT_CANDIDATES=( + $JBOSS_HOME/bin/launch/backward-compatibility.sh + $JBOSS_HOME/bin/launch/configure_extensions.sh + $JBOSS_HOME/bin/launch/passwd.sh + $JBOSS_HOME/bin/launch/messaging.sh + $JBOSS_HOME/bin/launch/datasource.sh + $JBOSS_HOME/bin/launch/resource-adapter.sh + $JBOSS_HOME/bin/launch/admin.sh + # Keep this order, jgroups.sh before ha.sh. jgroups.sh is the script which initializes the protocol list store + # used to share changes in the protocol list when a protocol is added either by ha.sh or by jgroups.sh. + # This protocol store is just a set of files under temporal directory. We need them to be able to share changes + # done by the ha.sh and jgroups.sh routines which are executed in subshells + $JBOSS_HOME/bin/launch/jgroups.sh + $JBOSS_HOME/bin/launch/ha.sh + $JBOSS_HOME/bin/launch/https.sh + $JBOSS_HOME/bin/launch/elytron.sh + $JBOSS_HOME/bin/launch/json_logging.sh + $JBOSS_HOME/bin/launch/configure_logger_category.sh + $JBOSS_HOME/bin/launch/security-domains.sh + $JBOSS_HOME/bin/launch/jboss_modules_system_pkgs.sh + $JBOSS_HOME/bin/launch/deploymentScanner.sh + $JBOSS_HOME/bin/launch/ports.sh + $JBOSS_HOME/bin/launch/access_log_valve.sh + $JBOSS_HOME/bin/launch/filters.sh + $JBOSS_HOME/bin/launch/statefulset.sh + /opt/run-java/proxy-options +) +# The server configuration file to use. If not set, wildfly-cekit-modules defaults to standalone.xml. +# For EAP we want standalone-openshift.xml +WILDFLY_SERVER_CONFIGURATION=standalone-openshift.xml +# The configuration adjustment mode. For EAP we want both xml marker replacement and CLI commands. +# Notice that the value of this variable must be aligned with the value configured in assemble +export CONFIG_ADJUSTMENT_MODE="xml_cli" diff --git a/jboss/container/eap/launch/ee-no-sso/configure.sh b/jboss/container/eap/launch/ee-no-sso/configure.sh new file mode 100644 index 00000000..1411b414 --- /dev/null +++ b/jboss/container/eap/launch/ee-no-sso/configure.sh @@ -0,0 +1,13 @@ +#!/bin/sh +set -e + +SCRIPT_DIR=$(dirname $0) +ADDED_DIR=${SCRIPT_DIR}/added + +mkdir -p ${JBOSS_HOME}/bin/launch +#Overwrite openshift-launch.sh + +cp -p ${ADDED_DIR}/launch/* ${JBOSS_HOME}/bin/launch + +#Ensure permissions +chmod -R g+rwX ${JBOSS_HOME}/bin/launch/ diff --git a/jboss/container/eap/launch/ee-no-sso/module.yaml b/jboss/container/eap/launch/ee-no-sso/module.yaml new file mode 100644 index 00000000..14c1d936 --- /dev/null +++ b/jboss/container/eap/launch/ee-no-sso/module.yaml @@ -0,0 +1,11 @@ +schema_version: 1 +name: jboss.container.eap.launch +version: '1.0-no-sso' +description: Module that enables CLI configuration for standalone-openshift.xml file, no SSO script +execute: +- script: configure.sh + user: '185' + +modules: + install: + - name: jboss.container.eap.launch.common \ No newline at end of file diff --git a/jboss/container/eap/launch/added/launch/launch-config.sh b/jboss/container/eap/launch/ee/added/launch/launch-config.sh similarity index 100% rename from jboss/container/eap/launch/added/launch/launch-config.sh rename to jboss/container/eap/launch/ee/added/launch/launch-config.sh diff --git a/jboss/container/eap/launch/ee/configure.sh b/jboss/container/eap/launch/ee/configure.sh new file mode 100644 index 00000000..1411b414 --- /dev/null +++ b/jboss/container/eap/launch/ee/configure.sh @@ -0,0 +1,13 @@ +#!/bin/sh +set -e + +SCRIPT_DIR=$(dirname $0) +ADDED_DIR=${SCRIPT_DIR}/added + +mkdir -p ${JBOSS_HOME}/bin/launch +#Overwrite openshift-launch.sh + +cp -p ${ADDED_DIR}/launch/* ${JBOSS_HOME}/bin/launch + +#Ensure permissions +chmod -R g+rwX ${JBOSS_HOME}/bin/launch/ diff --git a/jboss/container/eap/launch/ee/module.yaml b/jboss/container/eap/launch/ee/module.yaml new file mode 100644 index 00000000..7f5384a2 --- /dev/null +++ b/jboss/container/eap/launch/ee/module.yaml @@ -0,0 +1,11 @@ +schema_version: 1 +name: jboss.container.eap.launch +version: '1.0' +description: Module that enables CLI configuration for standalone-openshift.xml file +execute: +- script: configure.sh + user: '185' + +modules: + install: + - name: jboss.container.eap.launch.common \ No newline at end of file diff --git a/os-eap70-sso/configure.sh b/os-eap70-sso/configure.sh index cd6c5ec3..886b8e9a 100755 --- a/os-eap70-sso/configure.sh +++ b/os-eap70-sso/configure.sh @@ -4,8 +4,8 @@ SCRIPT_DIR=$(dirname $0) ADDED_DIR=${SCRIPT_DIR}/added SOURCES_DIR="/tmp/artifacts" -unzip -o $SOURCES_DIR/rh-sso-7.4.6-eap7-adapter.zip -d $JBOSS_HOME -unzip -o $SOURCES_DIR/rh-sso-7.4.6-saml-eap7-adapter.zip -d $JBOSS_HOME +unzip -o $SOURCES_DIR/rh-sso-7.4.10-eap7-adapter.zip -d $JBOSS_HOME +unzip -o $SOURCES_DIR/rh-sso-7.4.10-saml-eap7-adapter.zip -d $JBOSS_HOME chown -R jboss:root $JBOSS_HOME chmod -R g+rwX $JBOSS_HOME diff --git a/os-eap70-sso/module.yaml b/os-eap70-sso/module.yaml index e22dc356..aaefe2c5 100644 --- a/os-eap70-sso/module.yaml +++ b/os-eap70-sso/module.yaml @@ -7,9 +7,9 @@ execute: user: '185' artifacts: -- name: rh-sso-7.4.6-eap7-adapter - target: rh-sso-7.4.6-eap7-adapter.zip - md5: 10b1adaace20aae249ac124f4f32469a -- name: rh-sso-7.4.6-saml-eap7-adapter - target: rh-sso-7.4.6-saml-eap7-adapter.zip - md5: 7392404a47ddc22bdbd1f76982ca27c3 +- name: rh-sso-7.4.10-eap7-adapter + target: rh-sso-7.4.10-eap7-adapter.zip + md5: c397605d0e12baa060615bc80912d153 +- name: rh-sso-7.4.10-saml-eap7-adapter + target: rh-sso-7.4.10-saml-eap7-adapter.zip + md5: 3e5b3e8d416dde2894746891552012d6 diff --git a/tests/examples/test-app-advanced-extensions/pom.xml b/tests/examples/test-app-advanced-extensions/pom.xml index 585a34fa..f5a021a6 100644 --- a/tests/examples/test-app-advanced-extensions/pom.xml +++ b/tests/examples/test-app-advanced-extensions/pom.xml @@ -89,7 +89,7 @@ org.apache.maven.plugins maven-war-plugin - 2.3 + 3.3.2 false target diff --git a/tests/examples/test-app-drivers-at-runtime/pom.xml b/tests/examples/test-app-drivers-at-runtime/pom.xml index 585a34fa..f5a021a6 100644 --- a/tests/examples/test-app-drivers-at-runtime/pom.xml +++ b/tests/examples/test-app-drivers-at-runtime/pom.xml @@ -89,7 +89,7 @@ org.apache.maven.plugins maven-war-plugin - 2.3 + 3.3.2 false target diff --git a/tests/examples/test-app-drivers/pom.xml b/tests/examples/test-app-drivers/pom.xml index 585a34fa..f5a021a6 100644 --- a/tests/examples/test-app-drivers/pom.xml +++ b/tests/examples/test-app-drivers/pom.xml @@ -89,7 +89,7 @@ org.apache.maven.plugins maven-war-plugin - 2.3 + 3.3.2 false target diff --git a/tests/examples/test-app-ejb/pom.xml b/tests/examples/test-app-ejb/pom.xml index 5b38f66c..3557da51 100644 --- a/tests/examples/test-app-ejb/pom.xml +++ b/tests/examples/test-app-ejb/pom.xml @@ -29,6 +29,13 @@ test-app-ejb + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + \ No newline at end of file diff --git a/tests/examples/test-app-extension/pom.xml b/tests/examples/test-app-extension/pom.xml index 585a34fa..f5a021a6 100644 --- a/tests/examples/test-app-extension/pom.xml +++ b/tests/examples/test-app-extension/pom.xml @@ -89,7 +89,7 @@ org.apache.maven.plugins maven-war-plugin - 2.3 + 3.3.2 false target diff --git a/tests/examples/test-app-jaxrs-exclude/pom.xml b/tests/examples/test-app-jaxrs-exclude/pom.xml index 3170b85b..626bd5b3 100644 --- a/tests/examples/test-app-jaxrs-exclude/pom.xml +++ b/tests/examples/test-app-jaxrs-exclude/pom.xml @@ -64,7 +64,7 @@ org.apache.maven.plugins maven-war-plugin - 2.3 + 3.3.2 false target diff --git a/tests/examples/test-app-jaxrs/pom.xml b/tests/examples/test-app-jaxrs/pom.xml index 3170b85b..626bd5b3 100644 --- a/tests/examples/test-app-jaxrs/pom.xml +++ b/tests/examples/test-app-jaxrs/pom.xml @@ -64,7 +64,7 @@ org.apache.maven.plugins maven-war-plugin - 2.3 + 3.3.2 false target diff --git a/tests/examples/test-app-jpa2lc/pom.xml b/tests/examples/test-app-jpa2lc/pom.xml index 32d3691f..6e1a8cb5 100644 --- a/tests/examples/test-app-jpa2lc/pom.xml +++ b/tests/examples/test-app-jpa2lc/pom.xml @@ -29,6 +29,13 @@ test-app-jpa2lc + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + \ No newline at end of file diff --git a/tests/examples/test-app-postgres/pom.xml b/tests/examples/test-app-postgres/pom.xml index 585a34fa..f5a021a6 100644 --- a/tests/examples/test-app-postgres/pom.xml +++ b/tests/examples/test-app-postgres/pom.xml @@ -89,7 +89,7 @@ org.apache.maven.plugins maven-war-plugin - 2.3 + 3.3.2 false target diff --git a/tests/examples/test-app-settings/pom.xml b/tests/examples/test-app-settings/pom.xml index 585a34fa..f5a021a6 100644 --- a/tests/examples/test-app-settings/pom.xml +++ b/tests/examples/test-app-settings/pom.xml @@ -89,7 +89,7 @@ org.apache.maven.plugins maven-war-plugin - 2.3 + 3.3.2 false target diff --git a/tests/examples/test-app-web-security/pom.xml b/tests/examples/test-app-web-security/pom.xml index edc86461..3d344e90 100644 --- a/tests/examples/test-app-web-security/pom.xml +++ b/tests/examples/test-app-web-security/pom.xml @@ -36,7 +36,7 @@ org.apache.maven.plugins maven-war-plugin - 2.3 + 3.3.2 false target diff --git a/tests/examples/test-sso/app-profile-jee-saml/pom.xml b/tests/examples/test-sso/app-profile-jee-saml/pom.xml index b803f09e..68cb6a1b 100644 --- a/tests/examples/test-sso/app-profile-jee-saml/pom.xml +++ b/tests/examples/test-sso/app-profile-jee-saml/pom.xml @@ -72,6 +72,11 @@ false + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + diff --git a/tests/examples/test-sso/app-profile-jee/pom.xml b/tests/examples/test-sso/app-profile-jee/pom.xml index 4f4722a0..537311f6 100644 --- a/tests/examples/test-sso/app-profile-jee/pom.xml +++ b/tests/examples/test-sso/app-profile-jee/pom.xml @@ -50,6 +50,11 @@ false + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + diff --git a/tests/features/admin-jdk17.feature b/tests/features/admin-jdk17.feature new file mode 100644 index 00000000..bac3d056 --- /dev/null +++ b/tests/features/admin-jdk17.feature @@ -0,0 +1,20 @@ +@jboss-eap-7/eap74-openjdk17-openshift-rhel8 +Feature: EAP Openshift admin + + Scenario: Standard configuration + When container is started with env + | variable | value | + | ADMIN_USERNAME | kabir | + | ADMIN_PASSWORD | pass | + Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value management-http-authentication on XPath //*[local-name()='http-interface']/@http-authentication-factory + And file /opt/eap/standalone/configuration/mgmt-users.properties should contain kabir + + Scenario: Standard configuration, galleon s2i + Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master + | variable | value | + | ADMIN_USERNAME | kabir | + | ADMIN_PASSWORD | pass | + | GALLEON_PROVISION_LAYERS | core-server | + Then container log should contain WFLYSRV0025 + Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should have 0 elements on XPath //*[local-name()='http-interface'][@security-realm="ManagementRealm"] + And file /opt/eap/standalone/configuration/mgmt-users.properties should contain kabir \ No newline at end of file diff --git a/tests/features/admin.feature b/tests/features/admin.feature index 2fdc700a..5a69a9f6 100644 --- a/tests/features/admin.feature +++ b/tests/features/admin.feature @@ -1,4 +1,5 @@ -@jboss-eap-7 @jboss-eap-7-tech-preview +@jboss-eap-7/eap74-openjdk11-openshift-rhel8 @jboss-eap-7/eap74-openjdk8-openshift-rhel7 +@jboss-eap-7/eap-xp3-openjdk11-openshift-rhel8 @jboss-eap-7/eap-xp4-openjdk11-openshift-rhel8 Feature: EAP Openshift admin Scenario: Standard configuration diff --git a/tests/features/basic.feature b/tests/features/basic.feature index c080e16a..9b1b42dd 100644 --- a/tests/features/basic.feature +++ b/tests/features/basic.feature @@ -94,7 +94,7 @@ Feature: Common EAP tests Scenario: Check if jolokia is configured correctly When container is ready - Then container log should contain -javaagent:/usr/share/java/jolokia-jvm-agent/jolokia-jvm.jar=config=/opt/jboss/container/jolokia/etc/jolokia.properties + Then container log should contain -javaagent:/usr/share/java/jolokia-jvm-agent/jolokia-jvm.jar=config=/opt/jboss/container/jolokia/etc/jolokia.properties @redhat-sso-7-tech-preview/sso-cd-openshift @redhat-sso-7/sso73-openshift # https://issues.jboss.org/browse/CLOUD-295 diff --git a/tests/features/common.feature b/tests/features/common.feature index fe52aa38..bba086e8 100644 --- a/tests/features/common.feature +++ b/tests/features/common.feature @@ -1,5 +1,6 @@ @jboss-eap-7 @jboss-eap-6 @jboss-eap-7-tech-preview Feature: Openshift common test + Scenario: Check jolokia port is available When container is ready Then check that port 8778 is open @@ -48,15 +49,4 @@ Feature: Openshift common test And run sh -c 'test -L /usr/bin/jar && echo "yes" || echo "no"' in container and immediately check its output for yes And run sh -c 'test -L /usr/bin/rmic && echo "yes" || echo "no"' in container and immediately check its output for yes And run sh -c 'test -L /usr/bin/xjc && echo "yes" || echo "no"' in container and immediately check its output for yes - And run sh -c 'test -L /usr/bin/wsimport && echo "yes" || echo "no"' in container and immediately check its output for yes - - # JDK 11 images don't have xjc or wsimport - @jboss-eap-7-tech-preview/eap72-openjdk11-openshift - Scenario: Check that java binaries are linked properly - When container is ready - Then run sh -c 'test -L /usr/bin/java && echo "yes" || echo "no"' in container and immediately check its output for yes - And run sh -c 'test -L /usr/bin/keytool && echo "yes" || echo "no"' in container and immediately check its output for yes - And run sh -c 'test -L /usr/bin/rmid && echo "yes" || echo "no"' in container and immediately check its output for yes - And run sh -c 'test -L /usr/bin/javac && echo "yes" || echo "no"' in container and immediately check its output for yes - And run sh -c 'test -L /usr/bin/jar && echo "yes" || echo "no"' in container and immediately check its output for yes - And run sh -c 'test -L /usr/bin/rmic && echo "yes" || echo "no"' in container and immediately check its output for yes + And run sh -c 'test -L /usr/bin/wsimport && echo "yes" || echo "no"' in container and immediately check its output for yes \ No newline at end of file diff --git a/tests/features/datasource.feature b/tests/features/datasource.feature index a30f6df5..0ec93fee 100644 --- a/tests/features/datasource.feature +++ b/tests/features/datasource.feature @@ -764,7 +764,7 @@ Feature: EAP Openshift datasources | JDBC_SKIP_RECOVERY | true | | EE_DEFAULT_DATASOURCE | does-not-match-anything | Then container log should contain ERROR The list of configured datasources does not contain a datasource matching the ee default-bindings datasource specified with EE_DEFAULT_DATASOURCE='does-not-match-anything'. - + Scenario: check postgresql datasource, galleon s2i Given s2i build git://github.com/jboss-container-images/jboss-eap-modules from tests/examples/test-app-postgres with env and true | variable | value | diff --git a/tests/features/driver.feature b/tests/features/driver.feature index ac9877d4..d1b25162 100644 --- a/tests/features/driver.feature +++ b/tests/features/driver.feature @@ -15,7 +15,7 @@ Feature: EAP Openshift drivers Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value postgresql on XPath //*[local-name()='drivers']/*[local-name()='driver']/@name Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value org.postgresql.jdbc on XPath //*[local-name()='drivers']/*[local-name()='driver']/@module Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value org.postgresql.xa.PGXADataSource on XPath //*[local-name()='drivers']/*[local-name()='driver']/*[local-name()='xa-datasource-class'] - + Scenario: check oracle driver Given s2i build git://github.com/jboss-container-images/jboss-eap-modules from tests/examples/test-app-prov-oracle with env and true | variable | value | diff --git a/tests/features/galleon.feature b/tests/features/galleon.feature index ed2a4c93..142685b3 100644 --- a/tests/features/galleon.feature +++ b/tests/features/galleon.feature @@ -120,13 +120,13 @@ Feature: Openshift EAP galleon s2i tests Given XML namespaces | prefix | url | | ns | urn:jboss:domain:keycloak:1.1 | - Given s2i build https://github.com/redhat-developer/redhat-sso-quickstarts from . with env and true using 7.0.x-ose + Given s2i build https://github.com/jfdenise/redhat-sso-quickstarts from . with env and true using 7.0.x-ose | variable | value | | ARTIFACT_DIR | app-jee-jsp/target,app-profile-jee-jsp/target | | SSO_REALM | demo | | SSO_PUBLIC_KEY | MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiLezsNQtZSaJvNZXTmjhlpIJnnwgGL5R1vkPLdt7odMgDzLHQ1h4DlfJPuPI4aI8uo8VkSGYQXWaOGUh3YJXtdO1vcym1SuP8ep6YnDy9vbUibA/o8RW6Wnj3Y4tqShIfuWf3MEsiH+KizoIJm6Av7DTGZSGFQnZWxBEZ2WUyFt297aLWuVM0k9vHMWSraXQo78XuU3pxrYzkI+A4QpeShg8xE7mNrs8g3uTmc53KR45+wW1icclzdix/JcT6YaSgLEVrIR9WkkYfEGj3vSrOzYA46pQe6WQoenLKtIDFmFDPjhcPoi989px9f+1HCIYP0txBS/hnJZaPdn5/lEUKQIDAQAB | | SSO_URL | http://localhost:8080/auth | - | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 | + | MAVEN_ARGS_APPEND |-Dversion.war.maven.plugin=3.3.2 | | GALLEON_PROVISION_LAYERS | cloud-server | Then container log should contain WFLYCTL0310: Extension module org.keycloak.keycloak-adapter-subsystem not found @@ -342,7 +342,7 @@ Feature: Openshift EAP galleon s2i tests # CLOUD-3949 @ignore Scenario: Test cloud-server, exclude open-tracing and observability - Given failing s2i build git://github.com/openshift/openshift-jee-sample from . using master + Given failing s2i build git://github.com/openshift/openshift-jee-sample from . | variable | value | | GALLEON_PROVISION_LAYERS | cloud-server,-open-tracing,-observability | @@ -377,7 +377,7 @@ Feature: Openshift EAP galleon s2i tests # microprofile layer didn't make it in CD19 @ignore Scenario: Test jaxrs-server+microprofile, exclude all mp layers. - Given failing s2i build git://github.com/openshift/openshift-jee-sample from . using master + Given failing s2i build git://github.com/openshift/openshift-jee-sample from . | variable | value | | GALLEON_PROVISION_LAYERS | jaxrs-server,microprofile,-microprofile-config,-microprofile-fault-tolerance,-microprofile-jwt,-microprofile-metrics,-microprofile-openapi,-open-tracing | Then container log should contain WFLYSRV0025 diff --git a/tests/features/gc-jdk17.feature b/tests/features/gc-jdk17.feature new file mode 100644 index 00000000..4fd637ba --- /dev/null +++ b/tests/features/gc-jdk17.feature @@ -0,0 +1,131 @@ +@jboss-eap-7/eap74-openjdk17-openshift-rhel8 +Feature: Openshift OpenJDK GC tests + + Scenario: Check default GC configuration + When container is ready + Then container log should match regex ^ *JAVA_OPTS: *.* -XX:\+UseParallelGC\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MinHeapFreeRatio=10\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MaxHeapFreeRatio=20\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:GCTimeRatio=4\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:AdaptiveSizePolicyWeight=90\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MetaspaceSize=96m\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:\+ExitOnOutOfMemoryError\s + + Scenario: Check GC_MIN_HEAP_FREE_RATIO GC configuration + When container is started with env + | variable | value | + | GC_MIN_HEAP_FREE_RATIO | 5 | + Then container log should match regex ^ *JAVA_OPTS: *.* -XX:\+UseParallelGC\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MinHeapFreeRatio=5\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MaxHeapFreeRatio=20\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:GCTimeRatio=4\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:AdaptiveSizePolicyWeight=90\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MetaspaceSize=96m\s + + Scenario: Check GC_MAX_HEAP_FREE_RATIO GC configuration + When container is started with env + | variable | value | + | GC_MAX_HEAP_FREE_RATIO | 50 | + Then container log should match regex ^ *JAVA_OPTS: *.* -XX:\+UseParallelGC\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MinHeapFreeRatio=10\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MaxHeapFreeRatio=50\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:GCTimeRatio=4\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:AdaptiveSizePolicyWeight=90\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MetaspaceSize=96m\s + + Scenario: Check GC_TIME_RATIO GC configuration + When container is started with env + | variable | value | + | GC_TIME_RATIO | 5 | + Then container log should match regex ^ *JAVA_OPTS: *.* -XX:\+UseParallelGC\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MinHeapFreeRatio=10\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MaxHeapFreeRatio=20\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:GCTimeRatio=5\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:AdaptiveSizePolicyWeight=90\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MetaspaceSize=96m\s + + Scenario: Check GC_ADAPTIVE_SIZE_POLICY_WEIGHT GC configuration + When container is started with env + | variable | value | + | GC_ADAPTIVE_SIZE_POLICY_WEIGHT | 80 | + Then container log should match regex ^ *JAVA_OPTS: *.* -XX:\+UseParallelGC\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MinHeapFreeRatio=10\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MaxHeapFreeRatio=20\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:GCTimeRatio=4\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:AdaptiveSizePolicyWeight=80\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MetaspaceSize=96m\s + + Scenario: Check GC_METASPACE_SIZE and GC_MAX_METASPACE_SIZE GC configuration + When container is started with env + | variable | value | + | GC_METASPACE_SIZE | 60 | + | GC_MAX_METASPACE_SIZE | 120 | + Then container log should match regex ^ *JAVA_OPTS: *.* -XX:\+UseParallelGC\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MinHeapFreeRatio=10\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MaxHeapFreeRatio=20\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:GCTimeRatio=4\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:AdaptiveSizePolicyWeight=90\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MetaspaceSize=60m\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:MaxMetaspaceSize=120m\s + + Scenario: Check for adjusted heap sizes + When container is started with args + | arg | value | + | mem_limit | 1073741824 | + | env_json | {"JAVA_MAX_MEM_RATIO": 25, "JAVA_INITIAL_MEM_RATIO": 50} | + Then container log should match regex ^ *JAVA_OPTS: *.* -Xms128m\s + And container log should match regex ^ *JAVA_OPTS: *.* -Xmx256m\s + + # CLOUD-193 (mem-limit); CLOUD-459 (default heap size == max) + Scenario: CLOUD-193 Check for dynamic resource allocation + When container is started with args + | arg | value | + | mem_limit | 1073741824 | + Then container log should match regex ^ *JAVA_OPTS: *.* -Xms128m\s + And container log should match regex ^ *JAVA_OPTS: *.* -Xmx512m\s + + # CLOUD-459 (override default heap size) + Scenario: CLOUD-459 Check for adjusted default heap size + When container is started with args + | arg | value | + | mem_limit | 1073741824 | + | env_json | {"INITIAL_HEAP_PERCENT": 0.5} | + Then container log should match regex ^ *JAVA_OPTS: *.* -Xms256m\s + And container log should match regex ^ *JAVA_OPTS: *.* -Xmx512m\s + + Scenario: CLOUD-1524, test JAVA_CORE_LIMIT + When container is started with env + | variable | value | + | JAVA_CORE_LIMIT | 3 | + Then container log should match regex ^ *JAVA_OPTS: *.* -XX:ParallelGCThreads=3\s + And container log should match regex ^ *JAVA_OPTS: *.* -Djava.util.concurrent.ForkJoinPool.common.parallelism=3\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:CICompilerCount=2\s + + Scenario: CLOUD-1524, test JAVA_CORE_LIMIT < CONTAINER_CORE_LIMIT + When container is started with args and env + | arg_env | value | + | arg_cpu_quota | 20000 | + | arg_cpu_period | 5000 | + | env_JAVA_CORE_LIMIT | 2 | + Then container log should match regex ^ *JAVA_OPTS: *.* -XX:ParallelGCThreads=2\s + And container log should match regex ^ *JAVA_OPTS: *.* -Djava.util.concurrent.ForkJoinPool.common.parallelism=2\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:CICompilerCount=2\s + + Scenario: CLOUD-1524, test JAVA_CORE_LIMIT > CONTAINER_CORE_LIMIT + When container is started with args and env + | arg_env | value | + | arg_cpu_quota | 20000 | + | arg_cpu_period | 5000 | + | env_JAVA_CORE_LIMIT | 6 | + Then container log should match regex ^ *JAVA_OPTS: *.* -XX:ParallelGCThreads=4\s + And container log should match regex ^ *JAVA_OPTS: *.* -Djava.util.concurrent.ForkJoinPool.common.parallelism=4\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:CICompilerCount=2\s + + Scenario: CLOUD-1524, test CONTAINER_CORE_LIMIT + When container is started with args + | arg | value | + | cpu_quota | 20000 | + | cpu_period | 5000 | + Then container log should match regex ^ *JAVA_OPTS: *.* -XX:ParallelGCThreads=4\s + And container log should match regex ^ *JAVA_OPTS: *.* -Djava.util.concurrent.ForkJoinPool.common.parallelism=4\s + And container log should match regex ^ *JAVA_OPTS: *.* -XX:CICompilerCount=2\s \ No newline at end of file diff --git a/tests/features/gc.feature b/tests/features/gc.feature index 2ff4f2cf..a2cff5e0 100644 --- a/tests/features/gc.feature +++ b/tests/features/gc.feature @@ -1,4 +1,5 @@ -@jboss-eap-7 @jboss-eap-7-tech-preview +@jboss-eap-7/eap74-openjdk11-openshift-rhel8 @jboss-eap-7/eap74-openjdk8-openshift-rhel7 +@jboss-eap-7/eap-xp3-openjdk11-openshift-rhel8 @jboss-eap-7/eap-xp4-openjdk11-openshift-rhel8 Feature: Openshift OpenJDK GC tests Scenario: Check default GC configuration diff --git a/tests/features/https-jdk17.feature b/tests/features/https-jdk17.feature new file mode 100644 index 00000000..79dc8485 --- /dev/null +++ b/tests/features/https-jdk17.feature @@ -0,0 +1,56 @@ +@jboss-eap-7/eap74-openjdk17-openshift-rhel8 +Feature: Check HTTPS configuration + +Scenario: Configure HTTPS with an existing https-listener should give error + When container is started with command bash + | variable | value | + | EAP_HTTPS_PASSWORD | p@ssw0rd | + | EAP_HTTPS_KEYSTORE_DIR | /opt/eap | + | EAP_HTTPS_KEYSTORE | keystore.jks | + | HTTPS_KEYSTORE_TYPE | JKS | + Then copy features/jboss-eap-modules/scripts/https/add-https-listener-elytron.cli to /tmp in container + And run /opt/eap/bin/jboss-cli.sh --file=/tmp/add-https-listener-elytron.cli in container once + And run script -c /opt/eap/bin/openshift-launch.sh /tmp/boot.log in container and detach + And file /tmp/boot.log should contain There is already an undertow https-listener for the 'default-server' server so we are not adding it + + Scenario: Use Elytron for HTTPS (the default for JDK17) + When container is started with env + | variable | value | + | HTTPS_PASSWORD | p@ssw0rd | + | HTTPS_KEYSTORE_DIR | /opt/eap | + | HTTPS_KEYSTORE | keystore.jks | + | HTTPS_KEYSTORE_TYPE | JKS | + Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should have 0 elements on XPath //*[local-name()='security-realm'][@name="ApplicationRealm"]/*[local-name()='server-identities'] + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value https on XPath //*[local-name()='server'][@name="default-server"]/*[local-name()='https-listener']/@name + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value https on XPath //*[local-name()='server'][@name="default-server"]/*[local-name()='https-listener']/@socket-binding + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value LocalhostSslContext on XPath //*[local-name()='server'][@name="default-server"]/*[local-name()='https-listener']/@ssl-context + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value p@ssw0rd on XPath //*[local-name()='tls']/*[local-name()='key-stores']/*[local-name()='key-store'][@name="LocalhostKeyStore"]/*[local-name()='credential-reference']/@clear-text + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value JKS on XPath //*[local-name()='tls']/*[local-name()='key-stores']/*[local-name()='key-store'][@name="LocalhostKeyStore"]/*[local-name()='implementation']/@type + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value /opt/eap/keystore.jks on XPath //*[local-name()='tls']/*[local-name()='key-stores']/*[local-name()='key-store'][@name="LocalhostKeyStore"]/*[local-name()='file']/@path + +Scenario: Https, No undertow should give error + Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master + | variable | value | + | GALLEON_PROVISION_LAYERS | core-server | + | EAP_HTTPS_PASSWORD | p@ssw0rd | + | EAP_HTTPS_KEYSTORE_DIR | /opt/eap | + | EAP_HTTPS_KEYSTORE | keystore.jks | + | HTTPS_KEYSTORE_TYPE | JKS | + Then container log should contain You have set environment variables to configure Https. However, your base configuration does not contain the Undertow subsystem + + Scenario: Use Elytron for HTTPS, galleon s2i (the default for JDK17) + Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master + | variable | value | + | HTTPS_PASSWORD | p@ssw0rd | + | HTTPS_KEYSTORE_DIR | /opt/eap | + | HTTPS_KEYSTORE | keystore.jks | + | HTTPS_KEYSTORE_TYPE | JKS | + | GALLEON_PROVISION_LAYERS | cloud-server | + Then container log should contain WFLYSRV0025 + Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should have 0 elements on XPath //*[local-name()='security-realm'][@name="ApplicationRealm"]/*[local-name()='server-identities'] + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value https on XPath //*[local-name()='server'][@name="default-server"]/*[local-name()='https-listener']/@name + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value https on XPath //*[local-name()='server'][@name="default-server"]/*[local-name()='https-listener']/@socket-binding + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value LocalhostSslContext on XPath //*[local-name()='server'][@name="default-server"]/*[local-name()='https-listener']/@ssl-context + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value p@ssw0rd on XPath //*[local-name()='tls']/*[local-name()='key-stores']/*[local-name()='key-store'][@name="LocalhostKeyStore"]/*[local-name()='credential-reference']/@clear-text + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value JKS on XPath //*[local-name()='tls']/*[local-name()='key-stores']/*[local-name()='key-store'][@name="LocalhostKeyStore"]/*[local-name()='implementation']/@type + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value /opt/eap/keystore.jks on XPath //*[local-name()='tls']/*[local-name()='key-stores']/*[local-name()='key-store'][@name="LocalhostKeyStore"]/*[local-name()='file']/@path diff --git a/tests/features/https.feature b/tests/features/https.feature index a6449a1b..074fcbaa 100644 --- a/tests/features/https.feature +++ b/tests/features/https.feature @@ -1,4 +1,5 @@ -@jboss-eap-7 @jboss-eap-7-tech-preview +@jboss-eap-7/eap74-openjdk11-openshift-rhel8 @jboss-eap-7/eap74-openjdk8-openshift-rhel7 +@jboss-eap-7/eap-xp3-openjdk11-openshift-rhel8 @jboss-eap-7/eap-xp4-openjdk11-openshift-rhel8 Feature: Check HTTPS configuration # We are not able to test the following fail-fast error conditions diff --git a/tests/features/not-jdk17.feature b/tests/features/not-jdk17.feature new file mode 100644 index 00000000..36e6a7fa --- /dev/null +++ b/tests/features/not-jdk17.feature @@ -0,0 +1,25 @@ +@jboss-eap-7/eap74-openjdk11-openshift-rhel8 @jboss-eap-7/eap74-openjdk8-openshift-rhel7 +@jboss-eap-7/eap-xp3-openjdk11-openshift-rhel8 @jboss-eap-7/eap-xp4-openjdk11-openshift-rhel8 +Feature: Tests that can't run on jdk17 + + # JDK 11 images don't have xjc or wsimport + # This one is to be ignored when running jboss-eap-7/eap74-openjdk17-openshift-rhel8 + @jboss-eap-7-tech-preview/eap72-openjdk11-openshift + Scenario: Check that java binaries are linked properly + When container is ready + Then run sh -c 'test -L /usr/bin/java && echo "yes" || echo "no"' in container and immediately check its output for yes + And run sh -c 'test -L /usr/bin/keytool && echo "yes" || echo "no"' in container and immediately check its output for yes + And run sh -c 'test -L /usr/bin/rmid && echo "yes" || echo "no"' in container and immediately check its output for yes + And run sh -c 'test -L /usr/bin/javac && echo "yes" || echo "no"' in container and immediately check its output for yes + And run sh -c 'test -L /usr/bin/jar && echo "yes" || echo "no"' in container and immediately check its output for yes + And run sh -c 'test -L /usr/bin/rmic && echo "yes" || echo "no"' in container and immediately check its output for yes + + # CLOUD-807 + # JDK 11 needs an extra dep for javax.annotations + @jboss-eap-7-tech-preview/eap72-openjdk11-openshift + # Nashorn removed on JDk17 + Scenario: Test if the container has the JavaScript engine available + Given s2i build https://github.com/luck3y/openshift-examples from eap-tests/jsengine using openjdk-11 + Then container log should contain Engine found: jdk.nashorn.api.scripting.NashornScriptEngine + And container log should contain Engine class provider found. + And container log should not contain JavaScript engine not found. \ No newline at end of file diff --git a/tests/features/s2i-jdk17.feature b/tests/features/s2i-jdk17.feature new file mode 100644 index 00000000..fbd1f544 --- /dev/null +++ b/tests/features/s2i-jdk17.feature @@ -0,0 +1,17 @@ +@jboss-eap-7/eap74-openjdk17-openshift-rhel8 +Feature: Openshift EAP s2i tests + +# Like above, but JDK 11 options have changed. + # see cct_module/dynamic-resources for details. + # Test used to add -P jboss-eap-repository-insecure,-securecentral,insecurecentral but we can't use unsecure repos, they are banned by parent pom.xml. + @jboss-eap-7-tech-preview/eap72-openjdk11-openshift + Scenario: Test to ensure that maven is run with -Djava.net.preferIPv4Stack=true and user-supplied arguments, even when MAVEN_ARGS is overridden, and doesn't clear the local repository after the build + Given s2i build https://github.com/jboss-developer/jboss-eap-quickstarts from helloworld using openshift + | variable | value | + | MAVEN_ARGS | -e -Dcom.redhat.xpaas.repo.jbossorg -DskipTests package | + | MAVEN_ARGS_APPEND | -Dfoo=bar | + Then container log should contain WFLYSRV0025 + And run sh -c 'test -d /tmp/artifacts/m2/org && echo all good' in container and immediately check its output for all good + And s2i build log should contain -Djava.net.preferIPv4Stack=true + And s2i build log should contain -Dfoo=bar + And s2i build log should contain -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError diff --git a/tests/features/s2i.feature b/tests/features/s2i.feature index 08880806..a2294815 100644 --- a/tests/features/s2i.feature +++ b/tests/features/s2i.feature @@ -48,6 +48,8 @@ Feature: Openshift EAP s2i tests # CLOUD-579 Scenario: Test that maven is executed in batch mode Given s2i build https://github.com/jboss-openshift/openshift-examples from helloworld + | variable | value | + | MAVEN_ARGS_APPEND | -Dmaven.compiler.target=1.8 -Dmaven.compiler.source=1.8 -Dversion.war.plugin=3.3.2| Then s2i build log should contain --batch-mode And s2i build log should not contain \r @@ -59,22 +61,13 @@ Feature: Openshift EAP s2i tests And container log should contain Engine class provider found. And container log should not contain JavaScript engine not found. - # CLOUD-807 - # JDK 11 needs an extra dep for javax.annotations - @jboss-eap-7-tech-preview/eap72-openjdk11-openshift - Scenario: Test if the container has the JavaScript engine available - Given s2i build https://github.com/luck3y/openshift-examples from eap-tests/jsengine using openjdk-11 - Then container log should contain Engine found: jdk.nashorn.api.scripting.NashornScriptEngine - And container log should contain Engine class provider found. - And container log should not contain JavaScript engine not found. - # Always force IPv4 (CLOUD-188) # Append user-supplied arguments (CLOUD-412) # Allow the user to clear down the maven repository after running s2i (CLOUD-413) Scenario: Test to ensure that maven is run with -Djava.net.preferIPv4Stack=true and user-supplied arguments, and clears the local repository after the build Given s2i build https://github.com/jboss-openshift/openshift-examples from helloworld | variable | value | - | MAVEN_ARGS_APPEND | -Dfoo=bar | + | MAVEN_ARGS_APPEND | -Dfoo=bar -Dmaven.compiler.target=1.8 -Dmaven.compiler.source=1.8 -Dversion.war.plugin=3.3.2 | | MAVEN_LOCAL_REPO | /home/jboss/.m2/repository | | MAVEN_CLEAR_REPO | true | Then s2i build log should contain -Djava.net.preferIPv4Stack=true diff --git a/tests/features/scripts/https/add-https-listener-elytron.cli b/tests/features/scripts/https/add-https-listener-elytron.cli new file mode 100644 index 00000000..d1cf4ea2 --- /dev/null +++ b/tests/features/scripts/https/add-https-listener-elytron.cli @@ -0,0 +1,3 @@ +embed-server --timeout=30 --std-out=echo --server-config=standalone-openshift.xml +/subsystem=undertow/server=default-server/https-listener=https:add(ssl-context=applicationSSC, socket-binding=https, proxy-address-forwarding=true) +stop-embedded-server \ No newline at end of file diff --git a/tests/features/security_domains-jdk17.feature b/tests/features/security_domains-jdk17.feature new file mode 100644 index 00000000..a12886f3 --- /dev/null +++ b/tests/features/security_domains-jdk17.feature @@ -0,0 +1,150 @@ +@jboss-eap-7/eap74-openjdk17-openshift-rhel8 +Feature: EAP Openshift security domains + + Scenario: check security-domain configured + Given s2i build https://github.com/jboss-openshift/openshift-examples from security-custom-configuration with env + | variable | value | + | SECDOMAIN_NAME | HiThere | + Then container log should contain ERROR SECDOMAIN_NAME env variable can't be set, use ELYTRON_SECDOMAIN_NAME env variable to configure authentication using Elytron. + + Scenario: check Elytron configuration with elytron core realms security domain fail + Given s2i build https://github.com/jboss-container-images/jboss-eap-modules from tests/examples/test-app-web-security with env and true + | variable | value | + | ELYTRON_SECDOMAIN_NAME | my-security-domain | + | ELYTRON_SECDOMAIN_CORE_REALM | true | + Then container log should contain WFLYSRV0025 + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value my-security-domain on XPath //*[local-name()='subsystem' and starts-with(namespace-uri(), 'urn:jboss:domain:undertow:')]/*[local-name()='application-security-domains']/*[local-name()='application-security-domain']/@name + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value ApplicationDomain on XPath //*[local-name()='subsystem' and starts-with(namespace-uri(), 'urn:jboss:domain:undertow:')]/*[local-name()='application-security-domains']/*[local-name()='application-security-domain']/@security-domain + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value my-security-domain on XPath //*[local-name()='subsystem' and starts-with(namespace-uri(), 'urn:jboss:domain:ejb3:')]/*[local-name()='application-security-domains']/*[local-name()='application-security-domain']/@name + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value ApplicationDomain on XPath //*[local-name()='subsystem' and starts-with(namespace-uri(), 'urn:jboss:domain:ejb3:')]/*[local-name()='application-security-domains']/*[local-name()='application-security-domain']/@security-domain + And check that page is served + | property | value | + | expected_status_code | 401 | + | path | /test | + | port | 8080 | + + Scenario: check Elytron configuration with elytron core realms security domain success + Given s2i build https://github.com/jboss-container-images/jboss-eap-modules from tests/examples/test-app-web-security with env and true using master without running + | variable | value | + | ELYTRON_SECDOMAIN_NAME | my-security-domain | + | ELYTRON_SECDOMAIN_CORE_REALM | true | + When container integ- is started with command bash + Then run /opt/eap/bin/add-user.sh -a -u jfdenise -p pass -g Admin -sc /opt/eap/standalone/configuration in container once + And run script -c /opt/eap/bin/openshift-launch.sh /tmp/boot.log in container and detach + And check that port 8080 is open + And check that page is served + | property | value | + | path | /test | + | port | 8080 | + | username | jfdenise | + | password | pass | + + Scenario: check Elytron configuration with elytron core realms security domain fail, galleon + Given s2i build https://github.com/jboss-container-images/jboss-eap-modules from tests/examples/test-app-web-security with env and true + | variable | value | + | ELYTRON_SECDOMAIN_NAME | my-security-domain | + | ELYTRON_SECDOMAIN_CORE_REALM | true | + | GALLEON_PROVISION_LAYERS | datasources-web-server | + Then container log should contain WFLYSRV0025 + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value my-security-domain on XPath //*[local-name()='subsystem' and starts-with(namespace-uri(), 'urn:jboss:domain:undertow:')]/*[local-name()='application-security-domains']/*[local-name()='application-security-domain']/@name + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value ApplicationDomain on XPath //*[local-name()='subsystem' and starts-with(namespace-uri(), 'urn:jboss:domain:undertow:')]/*[local-name()='application-security-domains']/*[local-name()='application-security-domain']/@security-domain + And check that page is served + | property | value | + | expected_status_code | 401 | + | path | /test | + | port | 8080 | + + Scenario: check Elytron configuration with elytron core realms security domain success, galleon + Given s2i build https://github.com/jboss-container-images/jboss-eap-modules from tests/examples/test-app-web-security with env and true using master without running + | variable | value | + | ELYTRON_SECDOMAIN_NAME | my-security-domain | + | ELYTRON_SECDOMAIN_CORE_REALM | true | + | GALLEON_PROVISION_LAYERS | datasources-web-server | + When container integ- is started with command bash + Then run /opt/eap/bin/add-user.sh -a -u jfdenise -p pass -g Admin -sc /opt/eap/standalone/configuration in container once + And run script -c /opt/eap/bin/openshift-launch.sh /tmp/boot.log in container and detach + And check that port 8080 is open + And check that page is served + | property | value | + | path | /test | + | port | 8080 | + | username | jfdenise | + | password | pass | + + Scenario: check Elytron configuration with elytron custom security domain fail + Given s2i build https://github.com/jboss-container-images/jboss-eap-modules from tests/examples/test-app-web-security with env and true using master without running + | variable | value | + | ELYTRON_SECDOMAIN_NAME | my-security-domain | + | ELYTRON_SECDOMAIN_USERS_PROPERTIES | empty-foo-users.properties | + | ELYTRON_SECDOMAIN_ROLES_PROPERTIES | empty-foo-roles.properties | + When container integ- is started with command bash + Then copy features/jboss-eap-modules/scripts/security_domains/empty-foo-users.properties to /opt/eap/standalone/configuration/ in container + Then copy features/jboss-eap-modules/scripts/security_domains/empty-foo-roles.properties to /opt/eap/standalone/configuration/ in container + And run script -c /opt/eap/bin/openshift-launch.sh /tmp/boot.log in container and detach + And check that port 8080 is open + And check that page is served + | property | value | + | expected_status_code | 401 | + | path | /test | + | port | 8080 | + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value my-security-domain on XPath //*[local-name()='subsystem' and starts-with(namespace-uri(), 'urn:jboss:domain:undertow:')]/*[local-name()='application-security-domains']/*[local-name()='application-security-domain']/@name + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value my-security-domain on XPath //*[local-name()='subsystem' and starts-with(namespace-uri(), 'urn:jboss:domain:undertow:')]/*[local-name()='application-security-domains']/*[local-name()='application-security-domain']/@security-domain + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value my-security-domain on XPath //*[local-name()='subsystem' and starts-with(namespace-uri(), 'urn:jboss:domain:ejb3:')]/*[local-name()='application-security-domains']/*[local-name()='application-security-domain']/@name + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value my-security-domain on XPath //*[local-name()='subsystem' and starts-with(namespace-uri(), 'urn:jboss:domain:ejb3:')]/*[local-name()='application-security-domains']/*[local-name()='application-security-domain']/@security-domain + + Scenario: check Elytron configuration with elytron custom security domain success + Given s2i build https://github.com/jboss-container-images/jboss-eap-modules from tests/examples/test-app-web-security with env and true using master without running + | variable | value | + | ELYTRON_SECDOMAIN_NAME | my-security-domain | + | ELYTRON_SECDOMAIN_USERS_PROPERTIES | foo-users.properties | + | ELYTRON_SECDOMAIN_ROLES_PROPERTIES | foo-roles.properties | + When container integ- is started with command bash + Then copy features/jboss-eap-modules/scripts/security_domains/foo-users.properties to /opt/eap/standalone/configuration/ in container + Then copy features/jboss-eap-modules/scripts/security_domains/foo-roles.properties to /opt/eap/standalone/configuration/ in container + And run script -c /opt/eap/bin/openshift-launch.sh /tmp/boot.log in container and detach + And check that port 8080 is open + And check that page is served + | property | value | + | path | /test | + | port | 8080 | + | username | jfdenise | + | password | pass | + + Scenario: check Elytron configuration with elytron custom security domain fail, galleon + Given s2i build https://github.com/jboss-container-images/jboss-eap-modules from tests/examples/test-app-web-security with env and true using master without running + | variable | value | + | ELYTRON_SECDOMAIN_NAME | my-security-domain | + | ELYTRON_SECDOMAIN_USERS_PROPERTIES | empty-foo-users.properties | + | ELYTRON_SECDOMAIN_ROLES_PROPERTIES | empty-foo-roles.properties | + | GALLEON_PROVISION_LAYERS | datasources-web-server | + When container integ- is started with command bash + Then copy features/jboss-eap-modules/scripts/security_domains/empty-foo-users.properties to /opt/eap/standalone/configuration/ in container + Then copy features/jboss-eap-modules/scripts/security_domains/empty-foo-roles.properties to /opt/eap/standalone/configuration/ in container + And run script -c /opt/eap/bin/openshift-launch.sh /tmp/boot.log in container and detach + And check that port 8080 is open + And check that page is served + | property | value | + | expected_status_code | 401 | + | path | /test | + | port | 8080 | + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value my-security-domain on XPath //*[local-name()='subsystem' and starts-with(namespace-uri(), 'urn:jboss:domain:undertow:')]/*[local-name()='application-security-domains']/*[local-name()='application-security-domain']/@name + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value my-security-domain on XPath //*[local-name()='subsystem' and starts-with(namespace-uri(), 'urn:jboss:domain:undertow:')]/*[local-name()='application-security-domains']/*[local-name()='application-security-domain']/@security-domain + + Scenario: check Elytron configuration with elytron custom security domain success, galleon + Given s2i build https://github.com/jboss-container-images/jboss-eap-modules from tests/examples/test-app-web-security with env and true using master without running + | variable | value | + | ELYTRON_SECDOMAIN_NAME | my-security-domain | + | ELYTRON_SECDOMAIN_USERS_PROPERTIES | foo-users.properties | + | ELYTRON_SECDOMAIN_ROLES_PROPERTIES | foo-roles.properties | + | GALLEON_PROVISION_LAYERS | datasources-web-server | + When container integ- is started with command bash + Then copy features/jboss-eap-modules/scripts/security_domains/foo-users.properties to /opt/eap/standalone/configuration/ in container + Then copy features/jboss-eap-modules/scripts/security_domains/foo-roles.properties to /opt/eap/standalone/configuration/ in container + And run script -c /opt/eap/bin/openshift-launch.sh /tmp/boot.log in container and detach + And check that port 8080 is open + And check that page is served + | property | value | + | path | /test | + | port | 8080 | + | username | jfdenise | + | password | pass | diff --git a/tests/features/security_domains.feature b/tests/features/security_domains.feature index 34640b55..e5fe6214 100644 --- a/tests/features/security_domains.feature +++ b/tests/features/security_domains.feature @@ -1,4 +1,5 @@ -@jboss-eap-7 @jboss-eap-7-tech-preview +@jboss-eap-7/eap74-openjdk11-openshift-rhel8 @jboss-eap-7/eap74-openjdk8-openshift-rhel7 +@jboss-eap-7/eap-xp3-openjdk11-openshift-rhel8 @jboss-eap-7/eap-xp4-openjdk11-openshift-rhel8 Feature: EAP Openshift security domains Scenario: check security-domain configured diff --git a/tests/features/sso.feature b/tests/features/sso.feature index 49059008..97e0e45a 100644 --- a/tests/features/sso.feature +++ b/tests/features/sso.feature @@ -6,13 +6,13 @@ Feature: OpenShift EAP SSO tests Given XML namespaces | prefix | url | | ns | urn:jboss:domain:keycloak:1.1 | - Given s2i build https://github.com/redhat-developer/redhat-sso-quickstarts using 7.0.x-ose + Given s2i build https://github.com/jfdenise/redhat-sso-quickstarts using 7.0.x-ose | variable | value | | ARTIFACT_DIR | app-jee-jsp/target,app-profile-jee-jsp/target | | SSO_REALM | demo | | SSO_PUBLIC_KEY | MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiLezsNQtZSaJvNZXTmjhlpIJnnwgGL5R1vkPLdt7odMgDzLHQ1h4DlfJPuPI4aI8uo8VkSGYQXWaOGUh3YJXtdO1vcym1SuP8ep6YnDy9vbUibA/o8RW6Wnj3Y4tqShIfuWf3MEsiH+KizoIJm6Av7DTGZSGFQnZWxBEZ2WUyFt297aLWuVM0k9vHMWSraXQo78XuU3pxrYzkI+A4QpeShg8xE7mNrs8g3uTmc53KR45+wW1icclzdix/JcT6YaSgLEVrIR9WkkYfEGj3vSrOzYA46pQe6WQoenLKtIDFmFDPjhcPoi989px9f+1HCIYP0txBS/hnJZaPdn5/lEUKQIDAQAB | | SSO_URL | http://localhost:8080/auth | - | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 | + | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dversion.war.maven.plugin=3.3.2| Then container log should contain WFLYSRV0010: Deployed "app-profile-jsp.war" Then container log should contain WFLYSRV0010: Deployed "app-jsp.war" Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value demo on XPath //ns:realm/@name @@ -21,21 +21,21 @@ Feature: OpenShift EAP SSO tests Given XML namespaces | prefix | url | | ns | urn:jboss:domain:keycloak:1.1 | - Given s2i build http://github.com/bdecoste/keycloak-examples using securedeployments + Given s2i build http://github.com/jfdenise/keycloak-examples using securedeployments | variable | value | | ARTIFACT_DIR | app-profile-jee-saml/target,app-profile-jee/target | - | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 | + | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dversion.war.maven.plugin=3.3.2| Then container log should contain WFLYSRV0010: Deployed "app-profile-jee.war" Then container log should contain WFLYSRV0010: Deployed "app-profile-jee-saml.war" Scenario: Check default keycloak config - Given s2i build https://github.com/redhat-developer/redhat-sso-quickstarts using 7.0.x-ose + Given s2i build https://github.com/jfdenise/redhat-sso-quickstarts using 7.0.x-ose | variable | value | | ARTIFACT_DIR | app-jee-jsp/target,service-jee-jaxrs/target,app-profile-jee-jsp/target,app-profile-saml-jee-jsp/target | | SSO_REALM | demo | | SSO_PUBLIC_KEY | MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiLezsNQtZSaJvNZXTmjhlpIJnnwgGL5R1vkPLdt7odMgDzLHQ1h4DlfJPuPI4aI8uo8VkSGYQXWaOGUh3YJXtdO1vcym1SuP8ep6YnDy9vbUibA/o8RW6Wnj3Y4tqShIfuWf3MEsiH+KizoIJm6Av7DTGZSGFQnZWxBEZ2WUyFt297aLWuVM0k9vHMWSraXQo78XuU3pxrYzkI+A4QpeShg8xE7mNrs8g3uTmc53KR45+wW1icclzdix/JcT6YaSgLEVrIR9WkkYfEGj3vSrOzYA46pQe6WQoenLKtIDFmFDPjhcPoi989px9f+1HCIYP0txBS/hnJZaPdn5/lEUKQIDAQAB | | SSO_URL | http://localhost:8080/auth | - | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 | + | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dversion.war.maven.plugin=3.3.2 | Then container log should contain Deployed "service.war" And container log should contain Deployed "app-profile-jsp.war" And container log should contain Deployed "app-jsp.war" @@ -55,7 +55,7 @@ Feature: OpenShift EAP SSO tests And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value idp on XPath //*[local-name()='secure-deployment'][@name="app-profile-saml.war"]/*[local-name()='SP']/*[local-name()='IDP']/@entityID Scenario: Check custom keycloak config, elytron - Given s2i build https://github.com/redhat-developer/redhat-sso-quickstarts using 7.0.x-ose + Given s2i build https://github.com/jfdenise/redhat-sso-quickstarts using 7.0.x-ose | variable | value | | ARTIFACT_DIR | app-jee-jsp/target,service-jee-jaxrs/target,app-profile-jee-jsp/target,app-profile-saml-jee-jsp/target | | SSO_REALM | demo | @@ -65,7 +65,7 @@ Feature: OpenShift EAP SSO tests | SSO_BEARER_ONLY | true | | SSO_SAML_LOGOUT_PAGE | /tombrady | | SSO_FORCE_LEGACY_SECURITY | false | - | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 | + | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dversion.war.maven.plugin=3.3.2 | Then container log should contain Deployed "service.war" And container log should contain Deployed "app-profile-jsp.war" And container log should contain Deployed "app-jsp.war" @@ -83,11 +83,11 @@ Feature: OpenShift EAP SSO tests And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value /tombrady on XPath //*[local-name()='secure-deployment'][@name="app-profile-saml.war"]/*[local-name()='SP']/@logoutPage And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value true on XPath //*[local-name()='secure-deployment'][@name="app-profile-saml.war"]/*[local-name()='SP']/*[local-name()='Keys']/*[local-name()='Key']/@signing And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value idp on XPath //*[local-name()='secure-deployment'][@name="app-profile-saml.war"]/*[local-name()='SP']/*[local-name()='IDP']/@entityID - And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should have 2 elements on XPath //*[local-name()='application-security-domain'] + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should have 4 elements on XPath //*[local-name()='application-security-domain'] And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value keycloak on XPath //*[local-name()='application-security-domain']/@name Scenario: Check custom keycloak config - Given s2i build https://github.com/redhat-developer/redhat-sso-quickstarts using 7.0.x-ose + Given s2i build https://github.com/jfdenise/redhat-sso-quickstarts using 7.0.x-ose | variable | value | | ARTIFACT_DIR | app-jee-jsp/target,service-jee-jaxrs/target,app-profile-jee-jsp/target,app-profile-saml-jee-jsp/target | | SSO_REALM | demo | @@ -96,7 +96,7 @@ Feature: OpenShift EAP SSO tests | SSO_ENABLE_CORS | true | | SSO_BEARER_ONLY | true | | SSO_SAML_LOGOUT_PAGE | /tombrady | - | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 | + | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dversion.war.maven.plugin=3.3.2 | Then container log should contain Deployed "service.war" And container log should contain Deployed "app-profile-jsp.war" And container log should contain Deployed "app-jsp.war" @@ -114,20 +114,20 @@ Feature: OpenShift EAP SSO tests And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value /tombrady on XPath //*[local-name()='secure-deployment'][@name="app-profile-saml.war"]/*[local-name()='SP']/@logoutPage And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value true on XPath //*[local-name()='secure-deployment'][@name="app-profile-saml.war"]/*[local-name()='SP']/*[local-name()='Keys']/*[local-name()='Key']/@signing And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value idp on XPath //*[local-name()='secure-deployment'][@name="app-profile-saml.war"]/*[local-name()='SP']/*[local-name()='IDP']/@entityID - And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should have 0 elements on XPath //*[local-name()='application-security-domain'] - And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value keycloak on XPath //*[local-name()='security-domain']/@name + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should have 4 elements on XPath //*[local-name()='application-security-domain'] + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value keycloak on XPath //*[local-name()='application-security-domain']/@name Scenario: deploys the keycloak examples, then checks if it's deployed in cloud-server,sso layers. Given XML namespaces | prefix | url | | ns | urn:jboss:domain:keycloak:1.1 | - Given s2i build https://github.com/redhat-developer/redhat-sso-quickstarts from . with env and true using 7.0.x-ose + Given s2i build https://github.com/jfdenise/redhat-sso-quickstarts from . with env and true using 7.0.x-ose | variable | value | | ARTIFACT_DIR | app-jee-jsp/target,app-profile-jee-jsp/target | | SSO_REALM | demo | | SSO_PUBLIC_KEY | MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiLezsNQtZSaJvNZXTmjhlpIJnnwgGL5R1vkPLdt7odMgDzLHQ1h4DlfJPuPI4aI8uo8VkSGYQXWaOGUh3YJXtdO1vcym1SuP8ep6YnDy9vbUibA/o8RW6Wnj3Y4tqShIfuWf3MEsiH+KizoIJm6Av7DTGZSGFQnZWxBEZ2WUyFt297aLWuVM0k9vHMWSraXQo78XuU3pxrYzkI+A4QpeShg8xE7mNrs8g3uTmc53KR45+wW1icclzdix/JcT6YaSgLEVrIR9WkkYfEGj3vSrOzYA46pQe6WQoenLKtIDFmFDPjhcPoi989px9f+1HCIYP0txBS/hnJZaPdn5/lEUKQIDAQAB | | SSO_URL | http://localhost:8080/auth | - | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 | + | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dversion.war.maven.plugin=3.3.2 | | GALLEON_PROVISION_LAYERS | cloud-server,sso | Then container log should contain WFLYSRV0010: Deployed "app-profile-jsp.war" Then container log should contain WFLYSRV0010: Deployed "app-jsp.war" @@ -137,13 +137,13 @@ Feature: OpenShift EAP SSO tests Given XML namespaces | prefix | url | | ns | urn:jboss:domain:keycloak:1.1 | - Given s2i build https://github.com/redhat-developer/redhat-sso-quickstarts from . with env and true using 7.0.x-ose + Given s2i build https://github.com/jfdenise/redhat-sso-quickstarts from . with env and true using 7.0.x-ose | variable | value | | ARTIFACT_DIR | app-jee-jsp/target,app-profile-jee-jsp/target | | SSO_REALM | demo | | SSO_PUBLIC_KEY | MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiLezsNQtZSaJvNZXTmjhlpIJnnwgGL5R1vkPLdt7odMgDzLHQ1h4DlfJPuPI4aI8uo8VkSGYQXWaOGUh3YJXtdO1vcym1SuP8ep6YnDy9vbUibA/o8RW6Wnj3Y4tqShIfuWf3MEsiH+KizoIJm6Av7DTGZSGFQnZWxBEZ2WUyFt297aLWuVM0k9vHMWSraXQo78XuU3pxrYzkI+A4QpeShg8xE7mNrs8g3uTmc53KR45+wW1icclzdix/JcT6YaSgLEVrIR9WkkYfEGj3vSrOzYA46pQe6WQoenLKtIDFmFDPjhcPoi989px9f+1HCIYP0txBS/hnJZaPdn5/lEUKQIDAQAB | | SSO_URL | http://localhost:8080/auth | - | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 | + | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dversion.war.maven.plugin=3.3.2 | | GALLEON_PROVISION_LAYERS | cloud-server,sso | | SSO_SECURITY_DOMAIN | foo | Then container log should contain WFLYSRV0010: Deployed "app-profile-jsp.war" @@ -151,15 +151,15 @@ Feature: OpenShift EAP SSO tests Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value demo on XPath //ns:realm/@name Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should have 2 elements on XPath //*[local-name()='application-security-domain'] Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value foo on XPath //*[local-name()='application-security-domain']/@name - + Scenario: Check default keycloak config in cloud-server,sso layers. - Given s2i build https://github.com/redhat-developer/redhat-sso-quickstarts from . with env and true using 7.0.x-ose + Given s2i build https://github.com/jfdenise/redhat-sso-quickstarts from . with env and true using 7.0.x-ose | variable | value | | ARTIFACT_DIR | app-jee-jsp/target,service-jee-jaxrs/target,app-profile-jee-jsp/target,app-profile-saml-jee-jsp/target | | SSO_REALM | demo | | SSO_PUBLIC_KEY | MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiLezsNQtZSaJvNZXTmjhlpIJnnwgGL5R1vkPLdt7odMgDzLHQ1h4DlfJPuPI4aI8uo8VkSGYQXWaOGUh3YJXtdO1vcym1SuP8ep6YnDy9vbUibA/o8RW6Wnj3Y4tqShIfuWf3MEsiH+KizoIJm6Av7DTGZSGFQnZWxBEZ2WUyFt297aLWuVM0k9vHMWSraXQo78XuU3pxrYzkI+A4QpeShg8xE7mNrs8g3uTmc53KR45+wW1icclzdix/JcT6YaSgLEVrIR9WkkYfEGj3vSrOzYA46pQe6WQoenLKtIDFmFDPjhcPoi989px9f+1HCIYP0txBS/hnJZaPdn5/lEUKQIDAQAB | | SSO_URL | http://localhost:8080/auth | - | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 | + | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dversion.war.maven.plugin=3.3.2 | | GALLEON_PROVISION_LAYERS | cloud-server,sso | Then container log should contain Deployed "service.war" And container log should contain Deployed "app-profile-jsp.war" @@ -180,7 +180,7 @@ Feature: OpenShift EAP SSO tests And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value idp on XPath //*[local-name()='secure-deployment'][@name="app-profile-saml.war"]/*[local-name()='SP']/*[local-name()='IDP']/@entityID Scenario: Check custom keycloak config in cloud-server,sso layers. - Given s2i build https://github.com/redhat-developer/redhat-sso-quickstarts from . with env and true using 7.0.x-ose + Given s2i build https://github.com/jfdenise/redhat-sso-quickstarts from . with env and true using 7.0.x-ose | variable | value | | ARTIFACT_DIR | app-jee-jsp/target,service-jee-jaxrs/target,app-profile-jee-jsp/target,app-profile-saml-jee-jsp/target | | SSO_REALM | demo | @@ -189,7 +189,7 @@ Feature: OpenShift EAP SSO tests | SSO_ENABLE_CORS | true | | SSO_BEARER_ONLY | true | | SSO_SAML_LOGOUT_PAGE | /tombrady | - | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 | + | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dversion.war.maven.plugin=3.3.2 | | GALLEON_PROVISION_LAYERS | cloud-server,sso | Then container log should contain Deployed "service.war" And container log should contain Deployed "app-profile-jsp.war" @@ -212,24 +212,24 @@ Feature: OpenShift EAP SSO tests @ignore # we can't provision an unsecure configuration. Scenario: SSO, no elytron should give error - Given s2i build https://github.com/redhat-developer/redhat-sso-quickstarts from . with env and true using 7.0.x-ose + Given s2i build https://github.com/jfdenise/redhat-sso-quickstarts from . with env and true using 7.0.x-ose | variable | value | | ARTIFACT_DIR | app-jee-jsp/target,app-profile-jee-jsp/target | | SSO_REALM | demo | | SSO_PUBLIC_KEY | MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiLezsNQtZSaJvNZXTmjhlpIJnnwgGL5R1vkPLdt7odMgDzLHQ1h4DlfJPuPI4aI8uo8VkSGYQXWaOGUh3YJXtdO1vcym1SuP8ep6YnDy9vbUibA/o8RW6Wnj3Y4tqShIfuWf3MEsiH+KizoIJm6Av7DTGZSGFQnZWxBEZ2WUyFt297aLWuVM0k9vHMWSraXQo78XuU3pxrYzkI+A4QpeShg8xE7mNrs8g3uTmc53KR45+wW1icclzdix/JcT6YaSgLEVrIR9WkkYfEGj3vSrOzYA46pQe6WQoenLKtIDFmFDPjhcPoi989px9f+1HCIYP0txBS/hnJZaPdn5/lEUKQIDAQAB | | SSO_URL | http://localhost:8080/auth | - | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 | + | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dversion.war.maven.plugin=3.3.2 | | GALLEON_PROVISION_LAYERS | management | Then container log should contain You have set environment variables to enable sso. Fix your configuration to contain elytron subsystem for this to happen. Scenario: SSO, no undertow should give error - Given s2i build https://github.com/redhat-developer/redhat-sso-quickstarts from . with env and true using 7.0.x-ose without running + Given s2i build https://github.com/jfdenise/redhat-sso-quickstarts from . with env and true using 7.0.x-ose without running | variable | value | | ARTIFACT_DIR | app-jee-jsp/target,app-profile-jee-jsp/target | | SSO_REALM | demo | | SSO_PUBLIC_KEY | MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiLezsNQtZSaJvNZXTmjhlpIJnnwgGL5R1vkPLdt7odMgDzLHQ1h4DlfJPuPI4aI8uo8VkSGYQXWaOGUh3YJXtdO1vcym1SuP8ep6YnDy9vbUibA/o8RW6Wnj3Y4tqShIfuWf3MEsiH+KizoIJm6Av7DTGZSGFQnZWxBEZ2WUyFt297aLWuVM0k9vHMWSraXQo78XuU3pxrYzkI+A4QpeShg8xE7mNrs8g3uTmc53KR45+wW1icclzdix/JcT6YaSgLEVrIR9WkkYfEGj3vSrOzYA46pQe6WQoenLKtIDFmFDPjhcPoi989px9f+1HCIYP0txBS/hnJZaPdn5/lEUKQIDAQAB | | SSO_URL | http://localhost:8080/auth | - | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 | + | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dversion.war.maven.plugin=3.3.2 | | GALLEON_PROVISION_LAYERS | core-server | When container integ- is started with command bash # Add dummy script just for the then clause. @@ -238,13 +238,13 @@ Feature: OpenShift EAP SSO tests And file /tmp/boot.log should contain You have set environment variables to enable sso. Fix your configuration to contain undertow subsystem for this to happen. Scenario: SSO, undertow app sec domain already exists should give error - Given s2i build https://github.com/redhat-developer/redhat-sso-quickstarts from . with env and true using 7.0.x-ose without running + Given s2i build https://github.com/jfdenise/redhat-sso-quickstarts from . with env and true using 7.0.x-ose without running | variable | value | | ARTIFACT_DIR | app-jee-jsp/target,app-profile-jee-jsp/target | | SSO_REALM | demo | | SSO_PUBLIC_KEY | MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiLezsNQtZSaJvNZXTmjhlpIJnnwgGL5R1vkPLdt7odMgDzLHQ1h4DlfJPuPI4aI8uo8VkSGYQXWaOGUh3YJXtdO1vcym1SuP8ep6YnDy9vbUibA/o8RW6Wnj3Y4tqShIfuWf3MEsiH+KizoIJm6Av7DTGZSGFQnZWxBEZ2WUyFt297aLWuVM0k9vHMWSraXQo78XuU3pxrYzkI+A4QpeShg8xE7mNrs8g3uTmc53KR45+wW1icclzdix/JcT6YaSgLEVrIR9WkkYfEGj3vSrOzYA46pQe6WQoenLKtIDFmFDPjhcPoi989px9f+1HCIYP0txBS/hnJZaPdn5/lEUKQIDAQAB | | SSO_URL | http://localhost:8080/auth | - | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 | + | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dversion.war.maven.plugin=3.3.2 | | GALLEON_PROVISION_LAYERS | cloud-server,sso | When container integ- is started with command bash Then copy features/jboss-eap-modules/scripts/sso/add-undertow-sec-domain.cli to /tmp in container @@ -253,13 +253,13 @@ Feature: OpenShift EAP SSO tests And file /tmp/boot.log should contain Undertow already contains keycloak application security domain. Fix your configuration or set SSO_SECURITY_DOMAIN env variable. Scenario: SSO, ejb3 app sec domain already exists should give error - Given s2i build https://github.com/redhat-developer/redhat-sso-quickstarts from . with env and true using 7.0.x-ose without running + Given s2i build https://github.com/jfdenise/redhat-sso-quickstarts from . with env and true using 7.0.x-ose without running | variable | value | | ARTIFACT_DIR | app-jee-jsp/target,app-profile-jee-jsp/target | | SSO_REALM | demo | | SSO_PUBLIC_KEY | MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiLezsNQtZSaJvNZXTmjhlpIJnnwgGL5R1vkPLdt7odMgDzLHQ1h4DlfJPuPI4aI8uo8VkSGYQXWaOGUh3YJXtdO1vcym1SuP8ep6YnDy9vbUibA/o8RW6Wnj3Y4tqShIfuWf3MEsiH+KizoIJm6Av7DTGZSGFQnZWxBEZ2WUyFt297aLWuVM0k9vHMWSraXQo78XuU3pxrYzkI+A4QpeShg8xE7mNrs8g3uTmc53KR45+wW1icclzdix/JcT6YaSgLEVrIR9WkkYfEGj3vSrOzYA46pQe6WQoenLKtIDFmFDPjhcPoi989px9f+1HCIYP0txBS/hnJZaPdn5/lEUKQIDAQAB | | SSO_URL | http://localhost:8080/auth | - | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 | + | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dversion.war.maven.plugin=3.3.2 | | SSO_FORCE_LEGACY_SECURITY | false | When container integ- is started with command bash Then copy features/jboss-eap-modules/scripts/sso/add-ejb3-sec-domain.cli to /tmp in container @@ -268,12 +268,12 @@ Feature: OpenShift EAP SSO tests And file /tmp/boot.log should contain ejb3 already contains keycloak application security domain. Fix your configuration or set SSO_SECURITY_DOMAIN env variable. Scenario: Check deployment is properly deployed in cloud-server,sso layers - Given s2i build https://github.com/redhat-developer/redhat-sso-quickstarts from . with env and true using 7.0.x-ose + Given s2i build https://github.com/jfdenise/redhat-sso-quickstarts from . with env and true using 7.0.x-ose | variable | value | | ARTIFACT_DIR | app-profile-jee-jsp/target | | SSO_REALM | demo | | SSO_URL | http://localhost:8080/auth | - | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 | + | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dversion.war.maven.plugin=3.3.2 | | GALLEON_PROVISION_LAYERS | datasources-web-server,sso | Then container log should contain Existing other application-security-domain is extended with support for keycloak Then container log should contain WFLYSRV0025 @@ -283,10 +283,10 @@ Feature: OpenShift EAP SSO tests Given XML namespaces | prefix | url | | ns | urn:jboss:domain:keycloak:1.1 | - Given s2i build http://github.com/bdecoste/keycloak-examples using securedeployments + Given s2i build http://github.com/jfdenise/keycloak-examples using securedeployments | variable | value | | ARTIFACT_DIR | app-profile-jee/target | - | MAVEN_ARGS_APPEND | -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 | + | MAVEN_ARGS_APPEND |-Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dversion.war.maven.plugin=3.3.2 | | GALLEON_PROVISION_LAYERS | datasources-web-server,sso | Then container log should contain Existing other application-security-domain is extended with support for keycloak Then container log should contain WFLYSRV0025 diff --git a/tests/features/variable_expansion.feature b/tests/features/variable_expansion.feature index 14c9ff5d..a13b917a 100644 --- a/tests/features/variable_expansion.feature +++ b/tests/features/variable_expansion.feature @@ -39,6 +39,7 @@ Feature: Check correct variable expansion used | variable | value | | APP_DATADIR | configuration | | DATA_DIR | | + | MAVEN_ARGS_APPEND | -Dmaven.compiler.target=1.8 -Dmaven.compiler.source=1.8 -Dversion.war.plugin=3.3.2 | Then s2i build log should contain Copying app data from configuration to /opt/eap/standalone/data And run ls /opt/eap/standalone/data/standalone-openshift.xml in container and check its output for /opt/eap/standalone/data/standalone-openshift.xml @@ -48,6 +49,7 @@ Feature: Check correct variable expansion used | variable | value | | APP_DATADIR | modules/org/postgresql94/main | | DATA_DIR | /tmp/test | + | MAVEN_ARGS_APPEND | -Dmaven.compiler.target=1.8 -Dmaven.compiler.source=1.8 -Dversion.war.plugin=3.3.2 | Then s2i build log should contain Copying app data from modules/org/postgresql94/main to /tmp/test... And run ls /tmp/test/module.xml in container and check its output for /tmp/test/module.xml @@ -57,5 +59,6 @@ Feature: Check correct variable expansion used | variable | value | | APP_DATADIR | modules/org/postgresql94/main | | DATA_DIR | /tmp | + | MAVEN_ARGS_APPEND | -Dmaven.compiler.target=1.8 -Dmaven.compiler.source=1.8 -Dversion.war.plugin=3.3.2 | Then s2i build log should contain Copying app data from modules/org/postgresql94/main to /tmp... And run ls /tmp/module.xml in container and check its output for /tmp/module.xml