Skip to content

Commit 7db499c

Browse files
committed
Merge remote-tracking branch 'dynamo/main' into doca-nixlbench
2 parents 43ee4ac + 35403b3 commit 7db499c

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

.ci/jenkins/pipeline/proj-jjb.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,24 +61,26 @@
6161
try {{
6262
// Trigger the actual build and test jobs in parallel
6363
parallel build: {{
64-
def build = build job: 'nixl-ci-build', parameters: [
64+
def buildJob = 'nixl-ci-build'
65+
def build = build job: buildJob, parameters: [
6566
string(name: 'sha1', value: githubHelper.getMergedSHA()),
6667
string(name: 'githubData', value: VARIABLE_FROM_POST)
6768
], propagate: false
68-
currentBuild.description += "<br>Job: <a href='${{build.absoluteUrl}}'>nixl-ci-build</a> Result: <b style='color:${{build.result == 'SUCCESS' ? 'green' : 'red'}}'>${{build.result}}</b>"
69+
currentBuild.description += "<br>Job: <a href='${{JENKINS_URL}}blue/organizations/jenkins/NIXL%2F${{buildJob}}/detail/${{buildJob}}/${{build.number}}/pipeline/'>${{buildJob}}</a> Result: <b style='color:${{build.result == 'SUCCESS' ? 'green' : 'red'}}'>${{build.result}}</b>"
6970
if (!build.resultIsBetterOrEqualTo('SUCCESS')) {{
7071
currentBuild.result = build.result
71-
error("Build CI failed")
72+
error("Job ${{buildJob}} failed")
7273
}}
7374
}}, test: {{
74-
def build = build job: 'nixl-ci-test', parameters: [
75+
def buildJob = 'nixl-ci-test'
76+
def build = build job: buildJob, parameters: [
7577
string(name: 'sha1', value: githubHelper.getMergedSHA()),
7678
string(name: 'githubData', value: VARIABLE_FROM_POST)
7779
], propagate: false
78-
currentBuild.description += "<br>Job: <a href='${{build.absoluteUrl}}'>nixl-ci-test</a> Result: <b style='color:${{build.result == 'SUCCESS' ? 'green' : 'red'}}'>${{build.result}}</b>"
80+
currentBuild.description += "<br>Job: <a href='${{JENKINS_URL}}blue/organizations/jenkins/NIXL%2F${{buildJob}}/detail/${{buildJob}}/${{build.number}}/pipeline/'>${{buildJob}}</a> Result: <b style='color:${{build.result == 'SUCCESS' ? 'green' : 'red'}}'>${{build.result}}</b>"
7981
if (!build.resultIsBetterOrEqualTo('SUCCESS')) {{
8082
currentBuild.result = build.result
81-
error("Test CI failed")
83+
error("Job ${{buildJob}} failed")
8284
}}
8385
}},
8486
failFast: false // Continue even if some parallel jobs fail

0 commit comments

Comments
 (0)