diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2019-06-17 17:32:58 +0000 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2019-06-17 17:32:58 +0000 |
| commit | e6059b3d8d6277e068633a867f539b281f872938 (patch) | |
| tree | ca605408667d0d76deffffaa5241ecee217ffa8f /scripts | |
| parent | 2634cad695e41f4882a67a8cfa0e2579b870f1a3 (diff) | |
| parent | 679ac7f78efe91e3544d603839a12f00a414691e (diff) | |
| download | gitlab-ce-e6059b3d8d6277e068633a867f539b281f872938.tar.gz | |
Merge branch 'zj-disable-hooks-testing' into 'master'
Disable hooks by setting an ENV var
See merge request gitlab-org/gitlab-ce!29672
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/gitaly_test.rb | 5 |
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'] |