diff options
| author | Mark Lapierre <mlapierre@gitlab.com> | 2019-01-28 15:30:50 -0500 |
|---|---|---|
| committer | Mark Lapierre <mlapierre@gitlab.com> | 2019-01-30 15:16:37 -0500 |
| commit | f653952202a6734be597dd971c1155c82c6a1fba (patch) | |
| tree | f24e40f8def1dfa68113d0d31ff8ecd8d2b24da9 /qa/qa/git | |
| parent | 02c3c9dad5bc497e416040734bde90951d8f13a8 (diff) | |
| download | gitlab-ce-f653952202a6734be597dd971c1155c82c6a1fba.tar.gz | |
Don't use .netrc with SSH
There was a bug that required credentials when using SSH key auth when
using LFS. That bug was fixed so we shouldn't need to add credentials to
.netrc when using SSH anymore.
Diffstat (limited to 'qa/qa/git')
| -rw-r--r-- | qa/qa/git/repository.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/qa/qa/git/repository.rb b/qa/qa/git/repository.rb index df254ef288b..0aa94101098 100644 --- a/qa/qa/git/repository.rb +++ b/qa/qa/git/repository.rb @@ -117,8 +117,6 @@ module QA File.binwrite(private_key_file, key.private_key) File.chmod(0700, private_key_file) - try_add_credentials_to_netrc - @known_hosts_file = Tempfile.new("known_hosts_#{SecureRandom.hex(8)}") keyscan_params = ['-H'] keyscan_params << "-p #{uri.port}" if uri.port @@ -180,7 +178,6 @@ module QA def add_credentials? return false if !username || !password return true unless ssh_key_set? - return true if ssh_key_set? && use_lfs? false end |