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

Merge branch 'test' of http://8.163.30.128:10082/java-project/baiyue-firstleg into dev

Browse Source
This commit is contained in:
ouyangxq
2026-08-20 13:49:08 +08:00
parent 802893b2ff 164d862588
commit 50d9803566
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile.service
+4 -1
View File
@@ -170,9 +170,12 @@ pipeline {
steps { steps {
script { script {
boolean development = params.ENVIRONMENT == 'development' boolean development = params.ENVIRONMENT == 'development'
boolean testTargetIsLocal = ['master', 'built-in'].contains(env.NODE_NAME) ||
['master', 'built-in'].any { label -> env.NODE_LABELS?.tokenize()?.contains(label) }
boolean targetIsLocal = development boolean targetIsLocal = development
? env.NODE_LABELS?.tokenize()?.contains('java-dev') ? env.NODE_LABELS?.tokenize()?.contains('java-dev')
: env.NODE_NAME == 'master' : testTargetIsLocal
echo "构建节点 ${env.NODE_NAME} 部署到 ${params.ENVIRONMENT}，目标是否为本机: ${targetIsLocal}"
String credentialId = "firstleg-${params.ENVIRONMENT}-env" String credentialId = "firstleg-${params.ENVIRONMENT}-env"
String remoteTarget = development ? 'deploy@172.31.198.8' : 'deploy@172.31.198.7' String remoteTarget = development ? 'deploy@172.31.198.8' : 'deploy@172.31.198.7'
String remoteKey = development String remoteKey = development
scripts/test-environment-pipeline-contract.test.mjs
+1
View File
@@ -33,6 +33,7 @@ test('production deployments cannot skip tests', () => {
test('Java builds use the shared builder pool and deploy on the target environment node', () => { test('Java builds use the shared builder pool and deploy on the target environment node', () => {
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, /deploy-built-service\.sh/) assert.match(pipeline, /deploy-built-service\.sh/)
assert.match(directDeployScript, /docker save "\$IMAGE" \| gzip -1 \| run_ssh/) assert.match(directDeployScript, /docker save "\$IMAGE" \| gzip -1 \| run_ssh/)
assert.match(directDeployScript, /--pull never/) assert.match(directDeployScript, /--pull never/)