summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-05-29 12:17:42 -0600
committermo khan <mo.khan@gmail.com>2020-05-29 12:17:42 -0600
commitb050a1b7e1489db8a740d1ce235fd270e278be30 (patch)
tree7b867900b152b322065a1e9a553354b4a391548a
parentb1d0c974900aa30b6d7347687c631f469975efba (diff)
Specify CONAN_USER_USER and CONAN_RETRY* settings
-rw-r--r--lib/license/finder/ext/conan.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/license/finder/ext/conan.rb b/lib/license/finder/ext/conan.rb
index 1336882..ca2ee03 100644
--- a/lib/license/finder/ext/conan.rb
+++ b/lib/license/finder/ext/conan.rb
@@ -39,7 +39,7 @@ module LicenseFinder
end
def default_env
- {
+ @default_env ||= {
'CONAN_CACERT_PATH' => ENV.fetch('CONAN_CACERT_PATH', '/etc/ssl/certs/ca-certificates.crt'),
'CONAN_LOGGING_LEVEL' => ENV['LOG_LEVEL'],
'CONAN_LOGIN_USERNAME' => ENV.fetch('CONAN_LOGIN_USERNAME', 'ci_user'),
@@ -48,8 +48,14 @@ module LicenseFinder
'CONAN_PASSWORD' => ENV.fetch('CONAN_PASSWORD', ENV['CI_JOB_TOKEN']),
'CONAN_PRINT_RUN_COMMANDS' => '1',
'CONAN_REQUEST_TIMEOUT' => '5',
- 'CONAN_USER_HOME' => ENV.fetch('CONAN_USER_HOME', Dir.pwd)
+ 'CONAN_RETRY' => '1',
+ 'CONAN_RETRY_WAIT' => jitter,
+ 'CONAN_USER_HOME' => Dir.pwd
}
end
+
+ def jitter
+ rand(5).to_s
+ end
end
end