kubbo/pipeline-scripts
1
0
Fork 0
Code Pull Requests Actions Packages Projects Releases Wiki Activity

Update Jenkins pipeline to use devops branch and add merge stage

Browse Source
This commit is contained in:
aixianling
2024-10-31 14:32:41 +08:00
parent 59e02be537
commit bcfe679910
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
h5_jenkins
View File

@@ -9,14 +9,22 @@ pipeline {
steps { steps {
checkout([ checkout([
$class: 'GitSCM', $class: 'GitSCM',
branches: [[name: '*/build']], branches: [[name: '*/devops']],
doGenerateSubmoduleConfigurations: false, doGenerateSubmoduleConfigurations: false,
extensions: [], extensions: [],
submoduleCfg: [], 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('打包') { stage('打包') {
steps { steps {
echo "正在打包的工程==>: ${params.pid}" echo "正在打包的工程==>: ${params.pid}"