diff options
Diffstat (limited to 'tcwg-update-tested.sh')
| -rwxr-xr-x | tcwg-update-tested.sh | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/tcwg-update-tested.sh b/tcwg-update-tested.sh index 286eaebc..709ded88 100755 --- a/tcwg-update-tested.sh +++ b/tcwg-update-tested.sh @@ -19,15 +19,22 @@ set -u if $verbose; then set -x; fi -if [ x"$USER" = x"tcwg-buildslave" ]; then - git config --global user.name "TCWG Buildslave" - git config --global user.email tcwg-buildslave@linaro.org -fi +# Repos cloned by Jenkins have the core.hooksPath set to /dev/null, causing +# the "git review" command to fail (see +# https://storyboard.openstack.org/#!/story/2010342) so change it back to +# its default value. +git -C abe config --unset core.hooksPath +git -C abe review -s git -C abe push gerrit $GIT_COMMIT:refs/heads/tested + +git -C jenkins-scripts config --unset core.hooksPath +git -C jenkins-scripts review -s git -C jenkins-scripts push gerrit $GIT_COMMIT_1:refs/heads/tested pushd dockerfiles GIT_COMMIT_2=$(git rev-parse $GIT_COMMIT_2) + +git config --unset core.hooksPath git review -s git checkout -B tcwg-tested origin/tcwg-tested if [ x"$(git diff HEAD $GIT_COMMIT_2 | wc -l)" != x"0" ]; then @@ -42,7 +49,7 @@ if [ x"$(git diff HEAD $GIT_COMMIT_2 | wc -l)" != x"0" ]; then git commit --amend -C HEAD # Make sure there's no stale rebase from previous review. rm -rf .git/rebase-merge - # Submit review against tcwg-llvmprod branch + # Submit review against tcwg-tested branch git review -y tcwg-tested ssh -p29418 review.linaro.org gerrit review --code-review 2 --submit "$(git rev-parse HEAD)" fi |