diff options
| author | Yvan Roux <yvan.roux@linaro.org> | 2017-05-31 16:59:54 +0200 |
|---|---|---|
| committer | Yvan Roux <yvan.roux@linaro.org> | 2017-06-06 10:24:49 +0000 |
| commit | 4c61aea2f0ac808fc3e552a46527bd9bf96e29d8 (patch) | |
| tree | 9d6a07df15c5c2cc5d0e6afe566979705c571619 /tcwg-backport.yaml | |
| parent | b25d2b06a6ec2aa2c2319d3ddcfba15016f5bd96 (diff) | |
tcwg-backport: Prepare switch to abe/tested.
Since abe/tested branch is automatically updated, backport job needs to
fix abe's revision used for 'origin' and 'patch' buildfarm builds, the
logs being uploaded into a new layout:
tcwg-backport-<GCC_SHA1>/<ABE_SHORT_SHA1>/
Change-Id: Id222606d79cd60d7c8aece2045172d253a29d253
Diffstat (limited to 'tcwg-backport.yaml')
| -rw-r--r-- | tcwg-backport.yaml | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/tcwg-backport.yaml b/tcwg-backport.yaml index 63025f09..d1e60c0e 100644 --- a/tcwg-backport.yaml +++ b/tcwg-backport.yaml @@ -50,12 +50,22 @@ - git: url: https://git-us.linaro.org/toolchain/gcc.git refspec: +refs/changes/*:refs/remotes/changes/* + basedir: gcc branches: - ${GERRIT_PATCHSET_REVISION} skip-tag: true wipe-workspace: false reference-repo: /home/tcwg-buildslave/snapshots-ref/gcc.git choosing-strategy: gerrit + - git: + url: https://git-us.linaro.org/toolchain/abe.git + refspec: +refs/changes/*:refs/remotes/changes/* + basedir: abe + branches: + - $abe_branch + skip-tag: true + shallow-clone: true + wipe-workspace: true triggers: - gerrit: server-name: 'review.linaro.org' @@ -91,11 +101,12 @@ set -e set -x - gcc_patch_rev=$(git rev-parse $GERRIT_PATCHSET_REVISION) + abe_rev=$(git -C abe rev-parse --short $abe_branch) + gcc_patch_rev=$(git -C gcc rev-parse $GERRIT_PATCHSET_REVISION) if [ x"$gcc_orig" = x"gcc_patch_prev" ]; then gcc_orig="$gcc_patch_rev^" fi - gcc_orig_rev=$(git rev-parse $gcc_orig) + gcc_orig_rev=$(git -C gcc rev-parse $gcc_orig) case ${GERRIT_BRANCH} in *gcc-4_9*) @@ -117,31 +128,30 @@ cat <<EOF > gcc_orig_parameters override=$toolchainconf gcc=gcc.git@$gcc_orig_rev - log_name=tcwg-backport-$gcc_orig_rev/\$builder_type.\$target + log_name=tcwg-backport-$gcc_orig_rev/$abe_rev/\$builder_type.\$target rebuild=${rebuild} dont_fail=true log_server=$log_server target_list=$target_list - abe_branch=$abe_branch + abe_branch=$abe_rev displaytag=backport-ref-${GERRIT_CHANGE_NUMBER} EOF cat <<EOF > gcc_patch_parameters override=$toolchainconf gcc=gcc.git@$gcc_patch_rev - log_name=tcwg-backport-$gcc_patch_rev/\$builder_type.\$target + log_name=tcwg-backport-$gcc_patch_rev/$abe_rev/\$builder_type.\$target rebuild=${rebuild} dont_fail=true log_server=$log_server target_list=$target_list - abe_branch=$abe_branch + abe_branch=$abe_rev displaytag=backport-patch-${GERRIT_CHANGE_NUMBER} EOF cat <<EOF > compare_results_parameters - ref_logs=tcwg-backport-$gcc_orig_rev - new_logs=tcwg-backport-$gcc_patch_rev + ref_logs=tcwg-backport-$gcc_orig_rev/$abe_rev + new_logs=tcwg-backport-$gcc_patch_rev/$abe_rev log_server=$log_server - abe_branch=$abe_branch EOF - trigger-builds: - project: tcwg-buildfarm |