Update Jenkins pipeline to use devops branch and add merge stage

h5_jenkins

@@ -9,14 +9,22 @@ pipeline {
             steps {
                 checkout([
                     $class: 'GitSCM',
-                    branches: [[name: '*/build']],
+                    branches: [[name: '*/devops']],
                     doGenerateSubmoduleConfigurations: false,
                     extensions: [],
                     submoduleCfg: [],
-                    userRemoteConfigs: [[url: 'http://git.sinoecare.com/sinoecare/custom/base/base-wxcp.git',credentialsId:'b42f8b48-95a4-4039-ae51-b1dff06d943b']]
+                    userRemoteConfigs: [[url: 'http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app.git',credentialsId:'b42f8b48-95a4-4039-ae51-b1dff06d943b']]
                 ])
             }
         }
+        stage('合并'){
+            steps{
+                echo '代码合并...'
+                sh 'git config --global user.name "jenkins"'
+                sh 'git config --global user.email "aixianling@sinoecare.com"'
+                sh 'git merge origin/dev --no-ff'
+            }
+        }
         stage('打包') {
             steps {
                 echo "正在打包的工程==>: ${params.pid}"