Skip to content

Commit e7657b9

Browse files
Update distribution builds to have revision replacing version
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
1 parent 024138d commit e7657b9

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

jenkins/opensearch-dashboards/distribution-build.jenkinsfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ pipeline {
156156
BUILD_DOCKER = 'build_docker_with_build_number_tag'
157157
}
158158
def inputManifestObj = lib.jenkins.InputManifest.new(readYaml(file: "manifests/${INPUT_MANIFEST}"))
159-
env.version = inputManifestObj.build.version
159+
def version = inputManifestObj.build.version
160+
def qualifier = inputManifestObj.build.qualifier ? '-' + inputManifestObj.build.qualifier : ''
161+
env.revision = version + qualifier
160162
}
161163
}
162164
}
@@ -963,7 +965,7 @@ pipeline {
963965
node(AGENT_LINUX_X64) {
964966
script {
965967
if (params.RC_NUMBER.toInteger() > 0) {
966-
triggerDistributionValidationWorkflow(env.version)
968+
triggerDistributionValidationWorkflow(env.revision)
967969
}
968970
postCleanup()
969971
}

jenkins/opensearch/distribution-build.jenkinsfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,9 @@ pipeline {
163163
BUILD_DOCKER = 'build_docker_with_build_number_tag'
164164
}
165165
def inputManifestObj = lib.jenkins.InputManifest.new(readYaml(file: "manifests/${INPUT_MANIFEST}"))
166-
env.version = inputManifestObj.build.version
166+
def version = inputManifestObj.build.version
167+
def qualifier = inputManifestObj.build.qualifier ? '-' + inputManifestObj.build.qualifier : ''
168+
env.revision = version + qualifier
167169
}
168170
}
169171
}
@@ -970,7 +972,7 @@ pipeline {
970972
node(AGENT_LINUX_X64) {
971973
script {
972974
if (params.RC_NUMBER.toInteger() > 0) {
973-
triggerDistributionValidationWorkflow(env.version)
975+
triggerDistributionValidationWorkflow(env.revision)
974976
}
975977
postCleanup()
976978
}

0 commit comments

Comments
 (0)