From d920cf92746ac4799efdf621e3b78f65cd8fa4cb Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Thu, 8 Oct 2020 09:22:59 +0200 Subject: [PATCH] Fix explicit username setting in func test --- .../elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy | 2 +- .../internal/InternalDistributionBwcSetupPluginFuncTest.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy b/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy index 442f0ecc776e..696583301275 100644 --- a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy +++ b/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy @@ -114,7 +114,7 @@ abstract class AbstractGradleFuncTest extends Specification { void setupLocalGitRepo() { execute("git init") execute('git config user.email "build-tool@elastic.co"') - execute('git config --global user.name "Build tool"') + execute('git config user.name "Build tool"') execute("git add .") execute('git commit -m "Initial"') } diff --git a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPluginFuncTest.groovy b/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPluginFuncTest.groovy index 7b79bb25ba43..00ab6ccd34c8 100644 --- a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPluginFuncTest.groovy +++ b/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPluginFuncTest.groovy @@ -144,7 +144,7 @@ class InternalDistributionBwcSetupPluginFuncTest extends AbstractGradleFuncTest gradleRunner(workingRemoteGit, "wrapper").build() execute("git init", workingRemoteGit) execute('git config user.email "build-tool@elastic.co"', workingRemoteGit) - execute('git config --global user.name "Build tool"', workingRemoteGit) + execute('git config user.name "Build tool"', workingRemoteGit) execute("git add .", workingRemoteGit) execute('git commit -m"Initial"', workingRemoteGit) execute("git checkout -b origin/8.0", workingRemoteGit)