Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- slave.jnlp.sh 2019-04-25 14:48:03.000000000 -0700
- +++ slave.jnlp.sh 2019-04-25 15:10:36.000000000 -0700
- @@ -73,21 +73,8 @@
- echo "Launching slave process at ${JENKINS_JNLP_URL}"
- RESULT=-1
- -# If we use a trustStore for the Jenkins Master certificates, we need to pass it
- -# and its password to the java process that runs the slave. The password is stored
- -# in the OS X Keychain that we use for other purposes.
- -if [[ -f $JAVA_TRUSTSTORE ]]; then
- - JAVA_TRUSTSTORE_PASS=$( ${JENKINS_WRKSPC}/security.sh get-password --account=`whoami` --service=java_truststore ${AGENT} )
- - JAVA_ARGS_LOG="${JAVA_ARGS} -Djavax.net.ssl.trustStore=${JAVA_TRUSTSTORE} -Djavax.net.ssl.trustStorePassword=********"
- - JAVA_ARGS="${JAVA_ARGS} -Djavax.net.ssl.trustStore=${JAVA_TRUSTSTORE} -Djavax.net.ssl.trustStorePassword=${JAVA_TRUSTSTORE_PASS}"
- -fi
- -# The user and API token are required for Jenkins >= 1.498
- -if [ ! -z ${JENKINS_USER} ]; then
- - JENKINS_TOKEN=$( ${JENKINS_WRKSPC}/security.sh get-password --account=${JENKINS_USER} --service="${JENKINS_SLAVE}" ${AGENT} )
- - JENKINS_USER="-jnlpCredentials ${JENKINS_USER}:"
- -fi
- -echo "Calling java ${JAVA_ARGS_LOG} -jar ${JENKINS_WRKSPC}/slave.jar -jnlpUrl ${JENKINS_JNLP_URL} ${JENKINS_USER}********"
- -java ${JAVA_ARGS} -jar ${JENKINS_WRKSPC}/slave.jar -jnlpUrl ${JENKINS_JNLP_URL} ${JENKINS_USER}${JENKINS_TOKEN} &
- +echo "Calling java ${JAVA_ARGS_LOG} -jar ${JENKINS_WRKSPC}/slave.jar -jnlpUrl ${JENKINS_JNLP_URL} + <secret-key>"
- +java ${JAVA_ARGS} -jar ${JENKINS_WRKSPC}/slave.jar -jnlpUrl ${JENKINS_JNLP_URL} ${JENKINS_SECRET} &
- echo $! > ${JENKINS_WRKSPC}/.slave.pid
- wait `cat ${JENKINS_WRKSPC}/.slave.pid`
- unload
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement