Remove cherrypick lines to fetch the latest compass-adapters code
Change-Id: Ic89d719bbb586b52486c7142eb9a700396ee1def
This commit is contained in:
parent
7bc977aa65
commit
80f11cbf98
@ -23,7 +23,6 @@ copygit2dir()
|
|||||||
git reset --hard remotes/origin/master
|
git reset --hard remotes/origin/master
|
||||||
if [[ -n "$GERRIT_REFSPEC" ]];then
|
if [[ -n "$GERRIT_REFSPEC" ]];then
|
||||||
git fetch $gerrit_repo $GERRIT_REFSPEC && git checkout FETCH_HEAD
|
git fetch $gerrit_repo $GERRIT_REFSPEC && git checkout FETCH_HEAD
|
||||||
git fetch https://review.openstack.org/stackforge/compass-adapters refs/changes/20/86120/2 && git cherry-pick FETCH_HEAD
|
|
||||||
fi
|
fi
|
||||||
git clean -x -f
|
git clean -x -f
|
||||||
else
|
else
|
||||||
@ -34,7 +33,6 @@ copygit2dir()
|
|||||||
# project=$(echo $repo|rev|cut -d '/' -f 1|rev)
|
# project=$(echo $repo|rev|cut -d '/' -f 1|rev)
|
||||||
cd $destdir
|
cd $destdir
|
||||||
git fetch $gerrit_repo $GERRIT_REFSPEC && git checkout FETCH_HEAD
|
git fetch $gerrit_repo $GERRIT_REFSPEC && git checkout FETCH_HEAD
|
||||||
git fetch https://review.openstack.org/stackforge/compass-adapters refs/changes/20/86120/2 && git cherry-pick FETCH_HEAD
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
cd $SCRIPT_DIR
|
cd $SCRIPT_DIR
|
||||||
|
Loading…
Reference in New Issue
Block a user