From 64ed2e0384d168574a1455d384c25db1ad00440d Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Fri, 17 Apr 2020 18:07:33 -0400 Subject: [PATCH] Use GERRIT_BRANCH to use the correct lttng-ust artifacts The GERRIT_BRANCH matches between ust and tools afaik. Signed-off-by: Jonathan Rajotte --- jobs/lttng-tools.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index 00db6ef..d9bbe72 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -231,7 +231,7 @@ regex: (std|static|agents|debug-rcu) steps: - copyartifact: - project: lttng-ust_{ustversion}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=${{conf}},build=std + project: lttng-ust_${{GERRIT_BRANCH}}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=${{conf}},build=std which-build: last-successful stable: false filter: 'build/**' @@ -278,7 +278,7 @@ target: 'deps' do-not-fingerprint: true - copyartifact: - project: lttng-ust_{ustversion}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=std,build=std + project: lttng-ust_${{GERRIT_BRANCH}}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=std,build=std which-build: last-successful stable: false filter: 'build/**' @@ -1493,7 +1493,6 @@ jobs: - 'dev_gerrit_lttng-tools_{buildtype}': buildtype: build - ustversion: master arch: !!python/tuple [amd64] build: !!python/tuple [std, oot, dist, oot-dist] conf: !!python/tuple [std, no-ust, agents] -- 2.34.1