java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ci): deploy on target environment agents

Browse Source
This commit is contained in:
ouyangxq
2026-08-22 18:01:10 +08:00
parent e92cfe18ad
commit d3e16bf29f
2 changed files with 35 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile.service
+32 -45
View File
@@ -43,9 +43,6 @@ pipeline {
REGISTRY_CREDENTIALS = 'gitea-registry-token' REGISTRY_CREDENTIALS = 'gitea-registry-token'
MAVEN_SETTINGS = 'deploy/maven/settings-ci.xml' MAVEN_SETTINGS = 'deploy/maven/settings-ci.xml'
MAVEN_OPTS = '-Dfile.encoding=UTF-8 -Dmaven.wagon.http.retryHandler.count=3' MAVEN_OPTS = '-Dfile.encoding=UTF-8 -Dmaven.wagon.http.retryHandler.count=3'
DEVELOPMENT_SSH_TARGET = 'deploy@172.31.198.8'
DEVELOPMENT_SSH_KEY = '/var/jenkins_home/.ssh/dev_deploy'
DEVELOPMENT_DEPLOY_DIR = '/opt/firstleg/application'
} }
stages { stages {
@@ -150,55 +147,45 @@ pipeline {
sh "docker logout ${registryHost} || true" sh "docker logout ${registryHost} || true"
} }
} }
if (params.DEPLOY && !['development', 'test'].contains(params.ENVIRONMENT)) { if (params.DEPLOY) {
stash name: 'deployment-files', includes: 'deploy/**', useDefaultExcludes: true stash name: 'deployment-files', includes: 'deploy/**', useDefaultExcludes: true
} }
} }
} }
} }
}
post {
always {
cleanWs(deleteDirs: true, notFailBuild: true)
}
}
}
stage('直接部署开发或测试环境') { stage('部署开发或测试环境') {
when { when {
expression { params.DEPLOY && ['development', 'test'].contains(params.ENVIRONMENT) } beforeAgent true
} expression { params.DEPLOY && ['development', 'test'].contains(params.ENVIRONMENT) }
steps { }
script { agent {
String deployLock = "firstleg-${params.ENVIRONMENT}-deploy" label "${params.ENVIRONMENT == 'development' ? 'java-dev' : 'java-test'}"
lock(resource: deployLock, inversePrecedence: true) { }
boolean development = params.ENVIRONMENT == 'development' steps {
boolean testTargetIsLocal = ['master', 'built-in'].contains(env.NODE_NAME) || deleteDir()
['master', 'built-in'].any { label -> env.NODE_LABELS?.tokenize()?.contains(label) } unstash 'deployment-files'
boolean targetIsLocal = development script {
? env.NODE_LABELS?.tokenize()?.contains('java-dev') String deployLock = "firstleg-${params.ENVIRONMENT}-deploy"
: testTargetIsLocal String credentialId = "firstleg-${params.ENVIRONMENT}-env"
echo "构建节点 ${env.NODE_NAME} 部署到 ${params.ENVIRONMENT}，目标是否为本机: ${targetIsLocal}" lock(resource: deployLock, inversePrecedence: true) {
String credentialId = "firstleg-${params.ENVIRONMENT}-env" echo "在目标节点 ${env.NODE_NAME} 本机部署到 ${params.ENVIRONMENT}"
String remoteTarget = development ? 'deploy@172.31.198.8' : 'deploy@172.31.198.7' withEnv([
String remoteKey = development 'TARGET_IS_LOCAL=true'
? '/var/jenkins_home/.ssh/dev_deploy' ]) {
: '/home/deploy/.ssh/test_deploy' withCredentials([
String remoteKnownHosts = development file(credentialsId: credentialId, variable: 'DEPLOY_ENV_FILE'),
? '/var/jenkins_home/.ssh/known_hosts' usernamePassword(credentialsId: env.REGISTRY_CREDENTIALS,
: '/home/deploy/.ssh/known_hosts' usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PASSWORD')
String remoteDir = development
? '/opt/firstleg/application'
: '/opt/firstleg/test-application'
withEnv([
"TARGET_IS_LOCAL=${targetIsLocal}",
"TARGET_SSH_TARGET=${remoteTarget}",
"TARGET_SSH_KEY=${remoteKey}",
"TARGET_SSH_KNOWN_HOSTS=${remoteKnownHosts}",
"TARGET_DEPLOY_DIR=${remoteDir}"
]) { ]) {
withCredentials([ sh "sh deploy/scripts/deploy-built-service.sh '${params.ENVIRONMENT}' '${env.RESOLVED_IMAGE_REPOSITORY}' '${env.RESOLVED_IMAGE_TAG}' '${env.RESOLVED_SERVICE}' \"\$DEPLOY_ENV_FILE\""
file(credentialsId: credentialId, variable: 'DEPLOY_ENV_FILE'),
usernamePassword(credentialsId: env.REGISTRY_CREDENTIALS,
usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PASSWORD')
]) {
sh "sh deploy/scripts/deploy-built-service.sh '${params.ENVIRONMENT}' '${env.RESOLVED_IMAGE_REPOSITORY}' '${env.RESOLVED_IMAGE_TAG}' '${env.RESOLVED_SERVICE}' \"\$DEPLOY_ENV_FILE\""
}
}
} }
} }
} }
scripts/test-environment-pipeline-contract.test.mjs
+3 -1
View File
@@ -35,10 +35,12 @@ test('production deployments cannot skip tests', () => {
test('Java builds use the shared builder pool and serialize incremental target deployments', () => { test('Java builds use the shared builder pool and serialize incremental target deployments', () => {
assert.match(pipeline, /agent \{ label 'java-builder' \}/) assert.match(pipeline, /agent \{ label 'java-builder' \}/)
assert.match(pipeline, /\['development', 'test'\]\.contains\(params\.ENVIRONMENT\)/) assert.match(pipeline, /\['development', 'test'\]\.contains\(params\.ENVIRONMENT\)/)
assert.match(pipeline, /\['master', 'built-in'\]\.contains\(env\.NODE_NAME\)/) assert.match(pipeline, /params\.ENVIRONMENT == 'development' \? 'java-dev' : 'java-test'/)
assert.match(pipeline, /'TARGET_IS_LOCAL=true'/)
assert.match(pipeline, /String deployLock = "firstleg-\$\{params\.ENVIRONMENT\}-deploy"/) assert.match(pipeline, /String deployLock = "firstleg-\$\{params\.ENVIRONMENT\}-deploy"/)
assert.match(pipeline, /lock\(resource: deployLock, inversePrecedence: true\)/) assert.match(pipeline, /lock\(resource: deployLock, inversePrecedence: true\)/)
assert.match(pipeline, /deploy-built-service\.sh/) assert.match(pipeline, /deploy-built-service\.sh/)
assert.doesNotMatch(pipeline, /dev_deploy|test_deploy|TARGET_SSH_KEY/)
assert.match(directDeployScript, /docker pull "\$IMAGE"/) assert.match(directDeployScript, /docker pull "\$IMAGE"/)
assert.match(directDeployScript, /run_ssh docker pull "\$IMAGE"/) assert.match(directDeployScript, /run_ssh docker pull "\$IMAGE"/)
assert.doesNotMatch(directDeployScript, /docker save "\$IMAGE"/) assert.doesNotMatch(directDeployScript, /docker save "\$IMAGE"/)