add node deploy

@@ -11,6 +11,7 @@ pipeline {
 		string(name:'imageSource', defaultValue: 'yoho-online', description: '镜像存储的仓库')
 		string(name:'imageSource', defaultValue: 'yoho-online', description: '镜像存储的仓库')
 		string(name:'imageVersion', defaultValue: 'release-1.0-20181227144324', description: '镜像存储的版本')
 		string(name:'imageVersion', defaultValue: 'release-1.0-20181227144324', description: '镜像存储的版本')
 		choice(name:'isNeedCdn',choices:'NO\nYES\n', description: '是否需要上传CDN')
 		choice(name:'isNeedCdn',choices:'NO\nYES\n', description: '是否需要上传CDN')
+        choice(name:'isMergeMaster',choices:'NO\nYES\n', description: '是否需要合并master分支')
     }
     }
 	
 	
 	
 	
@@ -53,6 +54,10 @@ pipeline {
                 script {
                 script {
                     def PROJECT_WORK_DIR="${env.WORKSPACE}/${params.projectName}"
                     def PROJECT_WORK_DIR="${env.WORKSPACE}/${params.projectName}"
                     sh "git clone -b ${params.projectBranch} git@git.yoho.cn:${params.projectGitGroup}/${params.projectName}.git ${PROJECT_WORK_DIR}"
                     sh "git clone -b ${params.projectBranch} git@git.yoho.cn:${params.projectGitGroup}/${params.projectName}.git ${PROJECT_WORK_DIR}"
+                    if(params.isNeedCdn=='YES'){
+                        sh "cd ${PROJECT_WORK_DIR} && git merge --no-ff feature/dockerMerge"
+                    }
+                    
                 }
                 }
             }
             }
         }
         }