diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-04-06 11:59:02 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-04-06 11:59:02 +0000 |
| commit | dda9e59a4a3ab471001998d0e68d67ab12b4ac69 (patch) | |
| tree | ad7b589d18aec83d4f09d0e64b75e1581c85589b /spec/support/integration_test_helper.rb | |
| parent | 93a00df11d79c9f59141ff42ce05ab3b3d329375 (diff) | |
| parent | 93f7c568e1104936de011626d3bd7f56ebe66355 (diff) | |
Merge branch 'maven-airgap' into 'master'v3.7.0
Install certificate bundle.
See merge request gitlab-org/security-products/license-management!126
Diffstat (limited to 'spec/support/integration_test_helper.rb')
| -rw-r--r-- | spec/support/integration_test_helper.rb | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/spec/support/integration_test_helper.rb b/spec/support/integration_test_helper.rb index bcc5c1f..6c30a99 100644 --- a/spec/support/integration_test_helper.rb +++ b/spec/support/integration_test_helper.rb @@ -56,9 +56,13 @@ module IntegrationTestHelper end def clone(repo, branch: 'master') - execute({}, "git", "clone", '--quiet', repo, project_path) - Dir.chdir project_path do - execute({}, "git", "checkout", branch) + if branch.match?(/\b[0-9a-f]{5,40}\b/) + execute({}, 'git', 'clone', '--quiet', repo, project_path) + Dir.chdir project_path do + execute({}, 'git', 'checkout', branch) + end + else + execute({}, 'git', 'clone', '--quiet', '--depth=1', '--single-branch', '--branch', branch, repo, project_path) end end @@ -85,4 +89,11 @@ module IntegrationTestHelper def runner(*args) @runner ||= IntegrationTestRunner.new(*args) end + + def add_host(name, ip) + return unless ENV['LM_HOME'] + return if system("grep #{name} /etc/hosts") + + system("echo '#{ip} #{name}' >> /etc/hosts") + end end |
