|
|
@@ -69,11 +69,11 @@ pipeline {
|
|
|
script {
|
|
|
def (k8s, reg) = getProduLibs()
|
|
|
def services = reg.filterServices(reg.getServiceRegistry(), params)
|
|
|
- def srcTag = k8s.requireSourceTag(this, params.SOURCE_TAG)
|
|
|
+ env.SOURCE_TAG_RESOLVED = k8s.requireSourceTag(this, params.SOURCE_TAG)
|
|
|
env.PROMOTE_LIST = services*.prodDir.join(',')
|
|
|
env.TARGET_TAG_RESOLVED = k8s.resolveTargetTag(this, params.TARGET_TAG)
|
|
|
echo ">>> DEPLOY_MODE=${params.DEPLOY_MODE} 服务=${env.PROMOTE_LIST}"
|
|
|
- echo ">>> ${srcTag} → ${env.TARGET_TAG_RESOLVED}"
|
|
|
+ echo ">>> ${env.SOURCE_TAG_RESOLVED} → ${env.TARGET_TAG_RESOLVED}"
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -85,7 +85,7 @@ pipeline {
|
|
|
k8s.promoteHarborImages(this, services, [
|
|
|
harborRegistry: params.HARBOR_REGISTRY,
|
|
|
harborProject: params.HARBOR_PROJECT,
|
|
|
- sourceTag: params.SOURCE_TAG,
|
|
|
+ sourceTag: env.SOURCE_TAG_RESOLVED,
|
|
|
targetTag: env.TARGET_TAG_RESOLVED,
|
|
|
harborCredentialsId: env.HARBOR_CREDENTIALS,
|
|
|
dryRun: params.DRY_RUN == true,
|