Skip to content

Commit 24222fd

Browse files
committed
jobs/fix-builds: minor fixes
- include version in job description - fix passing `--arch` args to `cosa buildfetch` - use `:hammer:` emoji instead of `:key:` for Slack message
1 parent 85c98b3 commit 24222fd

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

jobs/fix-build.Jenkinsfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ if (params.VERSION == "") {
5656
throw new Exception("Missing VERSION parameter!")
5757
}
5858

59+
build_description = "${build_description}[$params.VERSION]"
60+
5961
// runtime parameter always wins
6062
def cosa_img = params.COREOS_ASSEMBLER_IMAGE
6163
cosa_img = cosa_img ?: pipeutils.get_cosa_img(pipecfg, params.STREAM)
@@ -94,7 +96,7 @@ lock(resource: "sign-${params.VERSION}") {
9496
pipeutils.shwrapWithAWSBuildUploadCredentials("""
9597
cosa init --branch ${ref} ${variant} ${pipecfg.source_config.url}
9698
cosa buildfetch --build=${params.VERSION} \
97-
${arch_args} --artifact=all --url=s3://${s3_stream_dir}/builds \
99+
${arch_args.join(' ')} --artifact=all --url=s3://${s3_stream_dir}/builds \
98100
--aws-config-file \${AWS_BUILD_UPLOAD_CONFIG}
99101
""")
100102
}
@@ -165,5 +167,5 @@ lock(resource: "sign-${params.VERSION}") {
165167
currentBuild.result = 'FAILURE'
166168
throw e
167169
} finally {
168-
pipeutils.trySlackSend(message: ":key: fix-build #${env.BUILD_NUMBER} <${env.BUILD_URL}|:jenkins:> <${env.RUN_DISPLAY_URL}|:ocean:> [${params.STREAM}][${basearches.join(' ')}] (${params.VERSION})")
170+
pipeutils.trySlackSend(message: ":hammer: fix-build #${env.BUILD_NUMBER} <${env.BUILD_URL}|:jenkins:> <${env.RUN_DISPLAY_URL}|:ocean:> [${params.STREAM}][${basearches.join(' ')}] (${params.VERSION})")
169171
}}} // try-catch-finally, cosaPod and lock finish here

0 commit comments

Comments
 (0)