fix pipeline

@@ -73,15 +73,17 @@ pipeline {
 
 	post {
 		always {
-			echo "Pipeline is done，begin send mail"
-			deleteDir() /* clean up our workspace */
-			println "###############################"
-			if(params.callBack!='noNeedCallBack'){
-				sh "curl '${callBack}&status=${currentBuild.currentResult}&jobId=${JOB_NAME},${BUILD_NUMBER}'"
+			script {
+				echo "Pipeline is done，begin send mail"
+				deleteDir() /* clean up our workspace */
+				println "###############################"
+				if(params.callBack!='noNeedCallBack'){
+					sh "curl '${callBack}&status=${currentBuild.currentResult}&jobId=${JOB_NAME},${BUILD_NUMBER}'"
+				}
+				mail to: "${env.QA_EMAIL},${params.userMail}",
+				subject: "PineLine '${JOB_NAME}' (${BUILD_NUMBER}),构建结果： ${currentBuild.currentResult}",
+				body: "构建的内容为：${params.projectName},提交人员：${params.userMail}"
 			}
-			mail to: "${env.QA_EMAIL},${params.userMail}",
-			subject: "PineLine '${JOB_NAME}' (${BUILD_NUMBER}),构建结果： ${currentBuild.currentResult}",
-			body: "构建的内容为：${params.projectName},提交人员：${params.userMail}"
 		}
 	}
 }

@@ -4,7 +4,7 @@ pipeline {
 
     parameters {
 		string(name:'callBack', defaultValue: 'noNeedCallBack', description: '回调服务地址')
-		choice(name:'clusterId',choices:'aws\nyoho-web-gray\nyoho-ops\nyoho-web\nyoho-media\n', description: '集群的信息')
+		choice(name:'clusterId',choices:'aws\nyoho-media\nyoho-ops\nyoho-web\nyoho-web-gray', description: '集群的信息')
 		string(name:'projectName', defaultValue: 'yoho-now', description: 'GITLAB应用名称')
 		string(name:'projectGitGroup', defaultValue: 'YOHONow', description: 'GITLAB所在的组')
 		string(name:'deployName', defaultValue: 'java-yoho-now', description: '应用名称')
@@ -112,7 +112,7 @@ pipeline {
           body: "构建的内容为：${params.projectName},提交人员：${params.userMail}"
 		  if(params.callBack!='noNeedCallBack'){
 			sh "curl '${callBack}&status=${currentBuild.currentResult}&jobId=${JOB_NAME},${BUILD_NUMBER}'"
-		}
+			}
 		  deleteDir() /*  clean up our workspace */
 		}
 	}