Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

[release-4.10] OCPBUGS-7238: Enable Websocket support #1587

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions slave-base/contrib/bin/run-jnlp-client
Expand Up @@ -103,6 +103,13 @@ if [[ $# -eq 0 ]]; then
fi
fi

# If Kubernetes plugin is configured to use WebSocket, add the -webSocket flag to the arguments
if [[ "$@" != *"-webSocket"* ]]; then
if [ ! -z "$JENKINS_WEB_SOCKET" ]; then
set -- "${@}" "-webSocket"
fi
fi

# if `docker run` has 2 or more arguments the user is passing jenkins launcher arguments
if [[ $(echo "$@" | awk '{print NF}') -gt 1 ]]; then
JAR="${JENKINS_HOME}/remoting.jar"
Expand Down