Skip to content

Commit 33f61dd

Browse files
Automator: update common-files@master in istio/api@master (#2873)
1 parent f036c56 commit 33f61dd

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

common/.commonfiles.sha

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
fcd31eb2297bc18a96ee4bafefcb3e1e298dc330
1+
aea3a48610b7476dccd70e84b3f84668e7fa7dca

common/scripts/tracing.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ function _genattrs() {
3737
# No upstream standard, so copy from https://github.com/jenkinsci/opentelemetry-plugin/blob/master/docs/job-traces.md
3838
if [[ -n "${PULL_NUMBER:=}" ]]
3939
then
40+
# Presubmit
4041
url="https://prow.istio.io/view/gs/istio-prow/pr-logs/pull/${REPO_OWNER}_${REPO_NAME}/${PULL_NUMBER}/${JOB_NAME}/${BUILD_ID},"
4142
else
43+
# Postsubmit or periodic
4244
url="https://prow.istio.io/view/gs/istio-prow/pr-logs/${JOB_NAME}/${BUILD_ID},"
4345
fi
4446
# Use printf instead of echo to avoid spaces between args
@@ -47,9 +49,9 @@ function _genattrs() {
4749
"ci.pipeline.run.url=${url}"\
4850
"ci.pipeline.run.number=${BUILD_ID},"\
4951
"ci.pipeline.run.id=${PROW_JOB_ID},"\
50-
"ci.pipeline.run.repo=${REPO_OWNER}/${REPO_NAME},"\
51-
"ci.pipeline.run.base=${PULL_BASE_REF},"\
52-
"ci.pipeline.run.pull_number=${PULL_NUMBER},"\
52+
"ci.pipeline.run.repo=${REPO_OWNER:-unknown}/${REPO_NAME:-unknown},"\
53+
"ci.pipeline.run.base=${PULL_BASE_REF:-none},"\
54+
"ci.pipeline.run.pull_number=${PULL_NUMBER:-none},"\
5355
"ci.pipeline.run.pull_sha=${PULL_PULL_SHA:-${PULL_BASE_SHA:-none}}"
5456
}
5557

0 commit comments

Comments
 (0)