Commit 57c1b1b7 authored by xujian's avatar xujian

Merge branch 'feature/HTJ-2.04.001-滚动索引' into develop

# Conflicts:
#	project.yaml
parents dc5b0e9f 4225e02d
......@@ -15,7 +15,7 @@ def push_path = "192.168.31.201/develop"
// def defaultBranch="release/HTJ-2.03.003-20241108"
def defaultBranch="feature/HTJ-2.04.001-20250116"
def defaultBranch="feature/HTJ-2.04.001-滚动索引"
pipeline {
agent any
......@@ -26,6 +26,7 @@ pipeline {
gitParameter branchFilter: 'origin/(.*)', defaultValue: defaultBranch, name: 'CORE', type: 'PT_BRANCH_TAG', useRepository: '.*factory-tobacco-qrcodecore.git' // 后端
gitParameter branchFilter: 'origin/(.*)', defaultValue: defaultBranch, name: 'HTJ', type: 'PT_BRANCH_TAG', useRepository: '.*factory-tobacco-qrcode-htj.git' // 后端
gitParameter branchFilter: 'origin/(.*)', defaultValue: defaultBranch, name: 'WEB', type: 'PT_BRANCH_TAG', useRepository: '.*factory-tobacco-qrcode-htj-vue.git' // 后端
booleanParam(name: 'DEPLOY', defaultValue: false, description: '是否部署')// 布尔值
}
tools {
......@@ -177,6 +178,7 @@ pipeline {
stage('步骤五: 服务部署'){
when { expression { return params.DEPLOY } }
steps {
withCredentials([file(credentialsId: '00789dc5-a86e-427d-9a57-f5d02a52cb6e', variable: 'KUBECONFIG_FILE')]) {
script {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment