summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-08-07 12:51:11 +0000
committerCan Eldem <celdem@gitlab.com>2020-08-07 12:51:11 +0000
commit71e548e24191f9afe53f5679906d464b24c5c985 (patch)
treef738829459a032079cf3afab3cc6cde895812c7c /spec
parentdae67cdc5db97d87b90b76b3283b674edc052e16 (diff)
parenta89906bb5f31fd2cbc7762aaaa8f4d9955568c48 (diff)
Merge branch '217904-deb-docker' into 'master'v3.20.1
Package license management deb from deb job See merge request gitlab-org/security-products/license-management!203
Diffstat (limited to 'spec')
-rw-r--r--spec/integration/dotnet/nuget_spec.rb4
-rw-r--r--spec/support/proxy_helper.rb1
2 files changed, 5 insertions, 0 deletions
diff --git a/spec/integration/dotnet/nuget_spec.rb b/spec/integration/dotnet/nuget_spec.rb
index 1d9a62c..90a189b 100644
--- a/spec/integration/dotnet/nuget_spec.rb
+++ b/spec/integration/dotnet/nuget_spec.rb
@@ -1,6 +1,10 @@
require 'spec_helper'
RSpec.describe "nuget" do
+ before do
+ system("rm -fr /opt/gitlab/.nuget/packages")
+ end
+
include_examples "each report version", "csharp", "nuget-dotnetcore"
context "when a project has a nuget packages.config file in the root" do
diff --git a/spec/support/proxy_helper.rb b/spec/support/proxy_helper.rb
index 9b42e18..9ad0dde 100644
--- a/spec/support/proxy_helper.rb
+++ b/spec/support/proxy_helper.rb
@@ -39,5 +39,6 @@ RSpec.configure do |config|
system("rm -f /usr/lib/ssl/certs/custom.*")
system("update-ca-certificates -v")
system("c_rehash -v")
+ system("cert_sync /etc/ssl/certs/ca-certificates.crt")
end
end