Advertisement
Guest User

Untitled

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