diff --git a/Base/Dockerfile b/Base/Dockerfile index 44e6f8e3f..e3e23c915 100644 --- a/Base/Dockerfile +++ b/Base/Dockerfile @@ -131,6 +131,8 @@ USER ${SEL_UID}:${SEL_GID} # Boolean value, maps "--bind-host" ENV SE_BIND_HOST false +# Boolean value, maps "--reject-unsupported-caps" +ENV SE_REJECT_UNSUPPORTED_CAPS false # A too high maximum number of file descriptors (with the default value # inherited from the docker host) can cause issues with some of our tools: diff --git a/Distributor/start-selenium-grid-distributor.sh b/Distributor/start-selenium-grid-distributor.sh index c9af77f71..7a761832d 100755 --- a/Distributor/start-selenium-grid-distributor.sh +++ b/Distributor/start-selenium-grid-distributor.sh @@ -88,6 +88,11 @@ if [ ! -z "$SE_REGISTRATION_SECRET" ]; then SE_OPTS="$SE_OPTS --registration-secret ${SE_REGISTRATION_SECRET}" fi +if [ ! -z "$SE_REJECT_UNSUPPORTED_CAPS" ]; then + echo "Appending Selenium options: --reject-unsupported-caps ${SE_REJECT_UNSUPPORTED_CAPS}" + SE_OPTS="$SE_OPTS --reject-unsupported-caps ${SE_REJECT_UNSUPPORTED_CAPS}" +fi + EXTRA_LIBS="" if [ ! -z "$SE_ENABLE_TRACING" ]; then diff --git a/Hub/start-selenium-grid-hub.sh b/Hub/start-selenium-grid-hub.sh index d93a0e92a..8bcb6a838 100755 --- a/Hub/start-selenium-grid-hub.sh +++ b/Hub/start-selenium-grid-hub.sh @@ -61,6 +61,11 @@ if [ ! -z "$SE_DISABLE_UI" ]; then SE_OPTS="$SE_OPTS --disable-ui ${SE_DISABLE_UI}" fi +if [ ! -z "$SE_REJECT_UNSUPPORTED_CAPS" ]; then + echo "Appending Selenium options: --reject-unsupported-caps ${SE_REJECT_UNSUPPORTED_CAPS}" + SE_OPTS="$SE_OPTS --reject-unsupported-caps ${SE_REJECT_UNSUPPORTED_CAPS}" +fi + EXTRA_LIBS="" if [ ! -z "$SE_ENABLE_TRACING" ]; then diff --git a/Standalone/start-selenium-standalone.sh b/Standalone/start-selenium-standalone.sh index 9f8c50baa..aa02ae06f 100755 --- a/Standalone/start-selenium-standalone.sh +++ b/Standalone/start-selenium-standalone.sh @@ -40,6 +40,11 @@ if [ ! -z "$SE_JAVA_SSL_TRUST_STORE" ]; then SE_JAVA_OPTS="$SE_JAVA_OPTS -Djdk.internal.httpclient.disableHostnameVerification=${SE_JAVA_DISABLE_HOSTNAME_VERIFICATION:-true}" fi +if [ ! -z "$SE_REJECT_UNSUPPORTED_CAPS" ]; then + echo "Appending Selenium options: --reject-unsupported-caps ${SE_REJECT_UNSUPPORTED_CAPS}" + SE_OPTS="$SE_OPTS --reject-unsupported-caps ${SE_REJECT_UNSUPPORTED_CAPS}" +fi + /opt/bin/generate_config echo "Selenium Grid Standalone configuration: " diff --git a/tests/charts/ci/base-tracing-values.yaml b/tests/charts/ci/base-tracing-values.yaml index 065b2c081..aea8964ed 100644 --- a/tests/charts/ci/base-tracing-values.yaml +++ b/tests/charts/ci/base-tracing-values.yaml @@ -1,5 +1,7 @@ hub: extraEnvironmentVariables: + - name: SE_REJECT_UNSUPPORTED_CAPS + value: "false" - name: SE_ENABLE_TRACING value: "true" - name: SE_JAVA_OPTS @@ -7,6 +9,8 @@ hub: components: extraEnvironmentVariables: + - name: SE_REJECT_UNSUPPORTED_CAPS + value: "false" - name: SE_ENABLE_TRACING value: "true" - name: SE_JAVA_OPTS