RISE/school-developer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'developer' into 'master'

Browse Source 
rebuild all

See merge request scj/zhxy/v3/cloud-ui!2
This commit is contained in:
王栋俊
2026-03-05 14:43:23 +00:00
parent 8767ec8593 57085824b6
commit fdabc8efcc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
deploy-tools/Jenkinsfile vendored
View File

@@ -28,14 +28,14 @@ node("height_A") {
switch(branch){ switch(branch){
case 'developer' : case 'developer' :
hostPort = 22 hostPort = 22
credentialsId = "scj-v3" credentialsId = "root-with-key-ubu-70"
remoteHost = "192.168.42.127" remoteHost = "192.168.42.127"
namespace = "scj-v3" namespace = "scj-v3"
profile = "developer" profile = "developer"
break; break;
case 'master': case 'master':
hostPort = 22 hostPort = 22
credentialsId = "cyweb-dev" credentialsId = "root-with-key-ubu-70"
remoteHost = "192.168.43.18" remoteHost = "192.168.43.18"
namespace = "city-zhxy-school-deploy-v3" namespace = "city-zhxy-school-deploy-v3"
profile = "deploy" profile = "deploy"
@@ -107,7 +107,7 @@ node("height_A") {
remote.host = "${remoteHost}" remote.host = "${remoteHost}"
remote.allowAnyHosts = true 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.user = "${username}"
remote.port = hostPort remote.port = hostPort
remote.identityFile = identity remote.identityFile = identity