test/vm_setup: don't change global git config
vm_setup.sh previously reconfigured the global git settings for whichever user it was run as; this isn't necessary, since we can just set the user/email within the iscsiadm repository's .git/config where it is needed for 'git am' to work. Change-Id: I11cdd84b4ae807e018ee38ba2ac1caaa76ba5d3b Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com> Reviewed-on: https://review.gerrithub.io/402887 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
parent
5d841040ab
commit
b90462d0eb
@ -71,10 +71,6 @@ cd ~
|
||||
|
||||
mkdir -p spdk_repo
|
||||
|
||||
# the configurations of username and email are needed later for applying patches to iscsiadm.
|
||||
git config --global user.name none
|
||||
git config --global user.email none
|
||||
|
||||
# The librxe-dev repository provides a command line tool called rxe_cfg which makes it
|
||||
# very easy to use Soft-RoCE. The build pool utilizes this command line tool in the absence
|
||||
# of any real RDMA NICs to simulate one for the NVMe-oF tests.
|
||||
@ -109,6 +105,11 @@ if [ "$CURRENT_VERSION" == "$OPEN_ISCSI_VER" ]; then
|
||||
git clone https://github.com/open-iscsi/open-iscsi
|
||||
|
||||
cd open-iscsi
|
||||
|
||||
# the configurations of username and email are needed for applying patches to iscsiadm.
|
||||
git config user.name none
|
||||
git config user.email none
|
||||
|
||||
git checkout 86e8892
|
||||
for patch in `ls ../patches`; do
|
||||
git am ../patches/$patch
|
||||
|
Loading…
Reference in New Issue
Block a user