File tree Expand file tree Collapse file tree 2 files changed +13
-11
lines changed Expand file tree Collapse file tree 2 files changed +13
-11
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,6 @@ require 'net/http'
66require 'uri'
77require 'fileutils'
88require 'rspec/core/rake_task'
9- require 'open-uri'
109require 'puppet-strings'
1110require 'puppet-strings/tasks'
1211require 'yaml'
@@ -157,18 +156,13 @@ namespace :artifact do
157156 end
158157
159158 namespace :snapshot do
160- begin
161- retries ||= 0
162- catalog = JSON . parse (
163- open ( 'https://artifacts-api.elastic.co/v1/branches/6.3' ) . read
164- ) [ 'latest' ]
165- rescue
166- retry if ( retries += 1 ) < 3
167- end
159+ snapshot_version = JSON . parse ( http_retry ( 'https://artifacts-api.elastic.co/v1/versions' ) ) [ 'versions' ] . reject do |version |
160+ version . include? 'alpha'
161+ end . last
168162
169- ENV [ 'snapshot_version' ] = catalog [ 'version' ]
163+ ENV [ 'snapshot_version' ] = snapshot_version
170164
171- downloads = catalog [ 'projects' ] [ ' elasticsearch' ] [ 'packages' ] . select do |pkg , _ |
165+ downloads = JSON . parse ( http_retry ( "https://artifacts-api.elastic.co/v1/search/ #{ snapshot_version } / elasticsearch" ) ) [ 'packages' ] . select do |pkg , _ |
172166 pkg =~ /(?:deb|rpm)/ and ( oss_package ? pkg =~ /oss/ : pkg !~ /oss/ )
173167 end . map do |package , urls |
174168 [ package . split ( '.' ) . last , urls ]
Original file line number Diff line number Diff line change 11require 'bcrypt'
2+ require 'open-uri'
23
34def to_agent_version ( puppet_version )
45 # REF: https://docs.puppet.com/puppet/latest/reference/about_agent.html
@@ -114,6 +115,13 @@ def vault_available?
114115 end . empty?
115116end
116117
118+ def http_retry ( url )
119+ retries ||= 0
120+ open ( url ) . read
121+ rescue
122+ retry if ( retries += 1 ) < 3
123+ end
124+
117125# Helper to store arbitrary testing setting values
118126def v
119127 RSpec . configuration . v
You can’t perform that action at this time.
0 commit comments