diff --git a/Jenkinsfile b/Jenkinsfile index 273da97..c9f94c7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,11 +18,14 @@ pipeline { // https://stackoverflow.com/questions/52093926/jenkins-pipeline-send-email-at-user-input // https://www.jenkins.io/doc/pipeline/steps/workflow-basic-steps/#mail-mail // Oder: http://{{jenkins_uri}}/blue/organizations/jenkins/${env.JOB_NAME - ohne /Branch}/detail/${env.BRANCH_NAME}/${env.BUILD_ID}/pipeline/${env.BUILD_ID} - emailext to: 'devel@zwackl.de', subject: "[${env.JOB_NAME}] is waiting for your decision", body: "${env.BUILD_URL}/input/" + emailext + to: 'devel@zwackl.de', + subject: "[${env.JOB_NAME}] is waiting for your decision", + body: "${env.BUILD_URL}/input/" userInput = input( - id: 'approve_deploy_at_prod', - ok: 'Yepp, go on!', - message: "Do you want to deploy version ${PROD_TAG}@${env.deployment_name} in PROD?"/*, + //id: 'approve_deploy_at_prod', + message: "Do you want to deploy version ${PROD_TAG}@${env.deployment_name} in PROD?", + ok: 'Yepp, go on!'/*, parameters: [ [ $class: 'BooleanParameterDefinition', @@ -34,11 +37,7 @@ pipeline { ) } } catch(org.jenkinsci.plugins.workflow.steps.FlowInterruptedException e) { - // input timed out - error "Caught ${e.toString()}" - } catch(err) { - // manually aborted - echo "This job has been aborted" + error "${e.toString()}: this job was either aborted or timed out." } /*if (userInput == true) { // do something