Commit f54e0511 authored by wentao.suo's avatar wentao.suo

ffff

parent 83a2795e
...@@ -350,7 +350,7 @@ def checkAndBuild(buildType,systemName,branchName,contextDir){ ...@@ -350,7 +350,7 @@ def checkAndBuild(buildType,systemName,branchName,contextDir){
checkout(buildType, systemName, branchName) checkout(buildType, systemName, branchName)
} }
/*prepare config*/ /*prepare config*/
stage('prepare config') { stage('config') {
prepare_config(buildType, systemName, contextDir) prepare_config(buildType, systemName, contextDir)
} }
/*build*/ /*build*/
...@@ -366,7 +366,7 @@ def checkAndBuild(buildType,systemName,branchName,contextDir){ ...@@ -366,7 +366,7 @@ def checkAndBuild(buildType,systemName,branchName,contextDir){
def dockerMake(imageTag,buildNumber,systemName,branchName,cluster,timeStemp){ def dockerMake(imageTag,buildNumber,systemName,branchName,cluster,timeStemp){
stage('make docker image') { stage('image') {
withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.36"]) { withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.36"]) {
def build_schema = "BUILD_TIME:${timeStemp}@BUILD_NUMBER:${buildNumber}@SYSTEM_NAME:${systemName}@BRANCH_NAME:${branchName}@CLUSTER:${cluster}" def build_schema = "BUILD_TIME:${timeStemp}@BUILD_NUMBER:${buildNumber}@SYSTEM_NAME:${systemName}@BRANCH_NAME:${branchName}@CLUSTER:${cluster}"
...@@ -392,7 +392,7 @@ def dockerMake(imageTag,buildNumber,systemName,branchName,cluster,timeStemp){ ...@@ -392,7 +392,7 @@ def dockerMake(imageTag,buildNumber,systemName,branchName,cluster,timeStemp){
def deploy(namespace, systemName, imageTag, tier, isDeploy) { def deploy(namespace, systemName, imageTag, tier, isDeploy) {
stage('Deploy To K8s Cluster'){ stage('deploy'){
def deploy_job_info def deploy_job_info
if (isDeploy=="true") { if (isDeploy=="true") {
......
...@@ -78,7 +78,7 @@ def call(body) { ...@@ -78,7 +78,7 @@ def call(body) {
} }
/* 4 */ /* 4 */
stage('Clear Cache Tmp'){ stage('clear'){
_utils.beautyEcho("Clear Cache Tmp", "stage") _utils.beautyEcho("Clear Cache Tmp", "stage")
_stage.clean_images(imageTag,contextDir) _stage.clean_images(imageTag,contextDir)
} }
......
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