summaryrefslogtreecommitdiff
path: root/spec/support
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-07-15 09:24:27 +0000
committerCan Eldem <celdem@gitlab.com>2020-07-15 09:24:27 +0000
commitf04805cf7b490b9ef9492e4ddc115ab7c2845ab6 (patch)
tree290e40b1b3f3c24579ed780e83ce55293e4b1de7 /spec/support
parentd8b18764499ed0378d5f5caf0d68460c39510cfe (diff)
parent4b9540b7724f89b2c3d2850193721abd415421f6 (diff)
Merge branch '217905-net-integration-test' into 'master'v3.18.0
Resolve nuget dependencies from a custom registry. See merge request gitlab-org/security-products/license-management!189
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/proxy_helper.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/support/proxy_helper.rb b/spec/support/proxy_helper.rb
index cf9e306..700fe38 100644
--- a/spec/support/proxy_helper.rb
+++ b/spec/support/proxy_helper.rb
@@ -7,7 +7,7 @@ module ProxyHelper
Dir.chdir License::Management.root.join('tmp') do
system([
"rm -f #{host}.*",
- "openssl req -x509 -newkey rsa:4096 -keyout #{host}.key -out #{host}.crt -days 999 -nodes -subj \"/C=/ST=/L=/O=/OU=/CN=*.test\"",
+ "/usr/bin/openssl req -x509 -newkey rsa:4096 -keyout #{host}.key -out #{host}.crt -days 999 -nodes -subj '/C=/ST=/L=/O=/OU=/CN=*.test' -addext 'subjectAltName=DNS:nuget.test,DNS:rubygems.test,DNS:goproxy.test'",
"cat #{host}.* > #{host}.pem"
].join("&&"))
end
@@ -36,5 +36,8 @@ RSpec.configure do |config|
config.after(:example, type: :integration) do
stop_proxy_server
system("rm -f /usr/local/share/ca-certificates/custom.*")
+ system("rm -f /usr/lib/ssl/certs/custom.*")
+ system("update-ca-certificates -v")
+ system("c_rehash -v")
end
end