summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2019-06-06 12:05:11 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2019-06-14 13:10:02 +0200
commit679ac7f78efe91e3544d603839a12f00a414691e (patch)
treec171050b19aeea1ba755467d955f483c3ae6ebca /scripts
parentccdd66d03531d84e20256a51dd1f4da204a7fbde (diff)
downloadgitlab-ce-679ac7f78efe91e3544d603839a12f00a414691e.tar.gz
Disable hooks by setting an ENV var
Prior to this change, the hooks directory got cleared. That works, but is not the way to go about it as there's a better way. Setting the env var this commits sets.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/gitaly_test.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/gitaly_test.rb b/scripts/gitaly_test.rb
index b5d3facd18a..b5cc5118530 100644
--- a/scripts/gitaly_test.rb
+++ b/scripts/gitaly_test.rb
@@ -23,7 +23,10 @@ module GitalyTest
'BUNDLE_FLAGS' => "--jobs=4 --retry=3",
'BUNDLE_INSTALL_FLAGS' => nil,
'BUNDLE_GEMFILE' => gemfile,
- 'RUBYOPT' => nil
+ 'RUBYOPT' => nil,
+
+ # Git hooks can't run during tests as the internal API is not running.
+ 'GITALY_TESTING_NO_GIT_HOOKS' => "1"
}
if ENV['CI']