From b90462d0eb1ba3171dbd546c7a000b9375ce23fc Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Tue, 6 Mar 2018 08:29:34 -0700 Subject: [PATCH] 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 Reviewed-on: https://review.gerrithub.io/402887 Tested-by: SPDK Automated Test System Reviewed-by: Karol Latecki Reviewed-by: Jim Harris Reviewed-by: Changpeng Liu --- test/config/vm_setup.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/config/vm_setup.sh b/test/config/vm_setup.sh index e5fdf1554..3cf0ff4d3 100755 --- a/test/config/vm_setup.sh +++ b/test/config/vm_setup.sh @@ -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