diff --git a/deploy-tools/Jenkinsfile b/deploy-tools/Jenkinsfile index 9ae5223..ecf70f5 100644 --- a/deploy-tools/Jenkinsfile +++ b/deploy-tools/Jenkinsfile @@ -28,17 +28,17 @@ node("height_A") { switch(branch){ case 'developer' : hostPort = 22 - credentialsId = "scj-v3" + credentialsId = "root-with-key-ubu-70" remoteHost = "192.168.42.127" namespace = "scj-v3" profile = "developer" break; case 'master': hostPort = 22 - credentialsId = "city-zhxy-deploy" - remoteHost = "192.168.41.228" - namespace = "scj-v3" - profile = "deploy" + credentialsId = "root-with-key-ubu-70" + remoteHost = "192.168.43.18" + namespace = "city-zhxy-school-deploy-v3" + profile = "deploy" break; default: error('未配置分支!放弃执行') @@ -107,7 +107,7 @@ node("height_A") { remote.host = "${remoteHost}" remote.allowAnyHosts = true - withCredentials([sshUserPrivateKey(credentialsId: 'root-with-key-ubu-70', keyFileVariable: 'identity', passphraseVariable: '', usernameVariable: 'username')]) { + withCredentials([sshUserPrivateKey(credentialsId: "${credentialsId}", keyFileVariable: 'identity', passphraseVariable: '', usernameVariable: 'username')]) { remote.user = "${username}" remote.port = hostPort remote.identityFile = identity @@ -122,6 +122,7 @@ node("height_A") { } + }catch(Exception e){ isSuccess = false currentBuild.result = 'FAILURE'