diff --git a/scripts/1clickservice.groovy b/scripts/1clickservice.groovy index c1ed771..a535dfb 100644 --- a/scripts/1clickservice.groovy +++ b/scripts/1clickservice.groovy @@ -111,20 +111,16 @@ pipeline { sed -ie \"\${dbstartline}d;\${dbendline}d\" Jenkinsfile - echo "114" databasecredsid=\$(uuidgen) - echo "116: notice that -s won't happen until line 123" - urlGetData=\"crumbIssuer/api/xml\\?xpath=concat\\(//crumbRequestField,\\":\\",//crumb\\)\"\" - echo "118" + urlGetData=\"crumbIssuer/api/xml?xpath=concat\\(//crumbRequestField,\\":\\",//crumb\\)\" + echo "116" echo \"\${urlGetData}\" - echo "120" - sleep 1 + echo "118" + echo \'curl -s \"http://${env.JENKINS_USR}:\\\'${env.JENKINS_PSW}\\\'@alloces.lan:8080/\${urlGetData}\"\' echo "122" - echo \"curl -s \"http://${env.JENKINS_USR}:\'${env.JENKINS_PSW}\'@alloces.lan:8080/\${urlGetData}\" - echo "123" - curl -s \"http://${env.JENKINS_USR}:\'${env.JENKINS_PSW}\'@alloces.lan:8080/\${urlGetData}\" + curl -s \"http://${env.JENKINS_USR}:\\\'${env.JENKINS_PSW}\\\'@alloces.lan:8080/\${urlGetData}\" - CRUMB=\$(curl -s \"http://${env.JENKINS_USR}:\'${env.JENKINS_PSW}\'@alloces.lan:8080/\${urlGetData}\") + CRUMB=\$(curl -s \"http://${env.JENKINS_USR}:\\\'${env.JENKINS_PSW}\\\'@alloces.lan:8080/\${urlGetData}\") echo \$CRUMB curl -H \$CRUMB -X POST \"http://${env.JENKINS_USR}:'${env.JENKINS_PSW}'@alloces.lan:8080/job/gitea.arg.rip/job/${servicename}/credentials/store/folder/domain/greyn%20services/createCredentials\" \ --data-urlencode 'json={