vanagon 0.24.0 → 0.26.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/git/basic_submodules.rb +1 -1
- data/lib/vanagon/component/source/git.rb +1 -1
- data/lib/vanagon/component.rb +2 -2
- data/lib/vanagon/engine/always_be_scheduling.rb +2 -2
- data/lib/vanagon/platform/defaults/osx-12-x86_64.rb +20 -0
- data/spec/lib/vanagon/engine/ec2_spec.rb +4 -2
- metadata +36 -32
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3cf4b2903976bd6b4e46ec533501890578962d1b2b8287f001f6251f0423a831
|
4
|
+
data.tar.gz: e1e832fe449490ac75f40f6f1de0e02722a909b048ddf562d3a6f1e23dfa835a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2df9721d59ea2c8fcc081c8163f3b088b368bf52f17996a0a1c445b9813506f478078445c6949c1a91cccce1cdfd684bd0e088f6034c05858fcf63b87e327066
|
7
|
+
data.tar.gz: '0818564b741957d07b721398cf016861971a2dbb0b628abfe33291a07a5fa3d78d95f966117ad0a3e85e5f2028a4c7c09ec40b46bd25ac507a935658ffda8378'
|
data/lib/git/basic_submodules.rb
CHANGED
@@ -36,7 +36,7 @@ module BasicSubmodules
|
|
36
36
|
# @option options [Boolean] :recursive recurse into nested submodules
|
37
37
|
# @return options [String] any output produced by `git` when submodules are initialized
|
38
38
|
def update_submodules(**options)
|
39
|
-
self.lib.update_submodules(options)
|
39
|
+
self.lib.update_submodules(**options)
|
40
40
|
end
|
41
41
|
end
|
42
42
|
|
@@ -50,7 +50,7 @@ class Vanagon
|
|
50
50
|
|
51
51
|
def valid_remote?(url, timeout = 0)
|
52
52
|
Timeout.timeout(timeout) do
|
53
|
-
Vanagon::Utilities.local_command("git ls-remote #{url} > /dev/null 2>&1")
|
53
|
+
Vanagon::Utilities.local_command("git ls-remote --heads #{url} > /dev/null 2>&1")
|
54
54
|
return false unless $?.exitstatus.zero?
|
55
55
|
return true
|
56
56
|
end
|
data/lib/vanagon/component.rb
CHANGED
@@ -258,7 +258,7 @@ class Vanagon
|
|
258
258
|
mirrors.to_a.shuffle.each do |mirror|
|
259
259
|
begin
|
260
260
|
VanagonLogger.info %(Attempting to fetch from mirror URL "#{mirror}")
|
261
|
-
@source = Vanagon::Component::Source.source(mirror, options)
|
261
|
+
@source = Vanagon::Component::Source.source(mirror, **options)
|
262
262
|
return true if source.fetch
|
263
263
|
rescue SocketError
|
264
264
|
# SocketError means that there was no DNS/name resolution
|
@@ -281,7 +281,7 @@ class Vanagon
|
|
281
281
|
# or False otherwise
|
282
282
|
def fetch_url(options)
|
283
283
|
VanagonLogger.info %(Attempting to fetch from canonical URL "#{url}")
|
284
|
-
@source = Vanagon::Component::Source.source(url, options)
|
284
|
+
@source = Vanagon::Component::Source.source(url, **options)
|
285
285
|
# Explicitly coerce the return value of #source.fetch,
|
286
286
|
# because each subclass of Vanagon::Component::Source returns
|
287
287
|
# an inconsistent value if #fetch is successful.
|
@@ -346,7 +346,7 @@ class Vanagon
|
|
346
346
|
end
|
347
347
|
|
348
348
|
def build_request_object
|
349
|
-
user = ENV['USER'] || ENV['USERNAME'] || '
|
349
|
+
user = ENV['USER'] || ENV['USERNAME'] || 'vanagon'
|
350
350
|
|
351
351
|
@saved_job_id = user + "-" + DateTime.now.strftime('%Q')
|
352
352
|
request_object = {
|
@@ -360,7 +360,7 @@ class Vanagon
|
|
360
360
|
:user => user
|
361
361
|
},
|
362
362
|
},
|
363
|
-
:priority =>
|
363
|
+
:priority => 3, # DO NOT use priority 1 in automated CI runs
|
364
364
|
}
|
365
365
|
unless @token_vmpooler.nil?
|
366
366
|
request_object[:vm_token] = @token_vmpooler
|
@@ -0,0 +1,20 @@
|
|
1
|
+
platform "osx-12-x86_64" do |plat|
|
2
|
+
plat.servicetype "launchd"
|
3
|
+
plat.servicedir "/Library/LaunchDaemons"
|
4
|
+
plat.codename "monterey"
|
5
|
+
plat.provision_with "export HOMEBREW_NO_EMOJI=true"
|
6
|
+
plat.provision_with "export HOMEBREW_VERBOSE=true"
|
7
|
+
plat.provision_with "sudo dscl . -create /Users/test"
|
8
|
+
plat.provision_with "sudo dscl . -create /Users/test UserShell /bin/bash"
|
9
|
+
plat.provision_with "sudo dscl . -create /Users/test UniqueID 1001"
|
10
|
+
plat.provision_with "sudo dscl . -create /Users/test PrimaryGroupID 1000"
|
11
|
+
plat.provision_with "sudo dscl . -create /Users/test NFSHomeDirectory /Users/test"
|
12
|
+
plat.provision_with "sudo dscl . -passwd /Users/test password"
|
13
|
+
plat.provision_with "sudo dscl . -merge /Groups/admin GroupMembership test"
|
14
|
+
plat.provision_with "echo 'test ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/username"
|
15
|
+
plat.provision_with "mkdir -p /etc/homebrew"
|
16
|
+
plat.provision_with "cd /etc/homebrew"
|
17
|
+
plat.provision_with %Q(su test -c 'echo | /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"')
|
18
|
+
plat.provision_with "sudo chown -R test:admin /Users/test/"
|
19
|
+
plat.vmpooler_template "macos-12-x86_64"
|
20
|
+
end
|
@@ -1,5 +1,4 @@
|
|
1
|
-
begin
|
2
|
-
require 'aws-sdk'
|
1
|
+
begin require 'aws-sdk'
|
3
2
|
rescue LoadError
|
4
3
|
$stderr.puts "Unable to load AWS SDK; skipping optional EC2 engine spec tests"
|
5
4
|
end
|
@@ -28,7 +27,10 @@ if defined? ::Aws
|
|
28
27
|
|
29
28
|
it 'returns "ec2" name' do
|
30
29
|
stub_request(:get, "http://169.254.169.254/latest/meta-data/iam/security-credentials/").
|
30
|
+
to_return(status: 200, body: "", headers: {})
|
31
|
+
stub_request(:put, "http://169.254.169.254/latest/api/token").
|
31
32
|
to_return(status: 200, body: "", headers: {})
|
33
|
+
|
32
34
|
expect(Vanagon::Engine::Ec2.new(platform_ec2).name).to eq('ec2')
|
33
35
|
end
|
34
36
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vanagon
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.26.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Puppet Labs
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-03-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: docopt
|
@@ -171,6 +171,7 @@ files:
|
|
171
171
|
- lib/vanagon/platform/defaults/fedora-34-x86_64.rb
|
172
172
|
- lib/vanagon/platform/defaults/osx-10.15-x86_64.rb
|
173
173
|
- lib/vanagon/platform/defaults/osx-11-x86_64.rb
|
174
|
+
- lib/vanagon/platform/defaults/osx-12-x86_64.rb
|
174
175
|
- lib/vanagon/platform/defaults/redhatfips-7-x86_64.rb
|
175
176
|
- lib/vanagon/platform/defaults/redhatfips-8-x86_64.rb
|
176
177
|
- lib/vanagon/platform/defaults/sles-12-x86_64.rb
|
@@ -312,9 +313,12 @@ require_paths:
|
|
312
313
|
- lib
|
313
314
|
required_ruby_version: !ruby/object:Gem::Requirement
|
314
315
|
requirements:
|
315
|
-
- - "
|
316
|
+
- - ">="
|
316
317
|
- !ruby/object:Gem::Version
|
317
318
|
version: '2.3'
|
319
|
+
- - "<"
|
320
|
+
- !ruby/object:Gem::Version
|
321
|
+
version: '4'
|
318
322
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
319
323
|
requirements:
|
320
324
|
- - ">="
|
@@ -326,42 +330,42 @@ signing_key:
|
|
326
330
|
specification_version: 3
|
327
331
|
summary: All of your packages will fit into this van with this one simple trick.
|
328
332
|
test_files:
|
333
|
+
- spec/lib/git/rev_list_spec.rb
|
334
|
+
- spec/lib/makefile_spec.rb
|
329
335
|
- spec/lib/vanagon/project_spec.rb
|
330
|
-
- spec/lib/vanagon/utilities/extra_files_signer_spec.rb
|
331
|
-
- spec/lib/vanagon/utilities/shell_utilities_spec.rb
|
332
|
-
- spec/lib/vanagon/extensions/string_spec.rb
|
333
|
-
- spec/lib/vanagon/extensions/set/json_spec.rb
|
334
|
-
- spec/lib/vanagon/extensions/ostruct/json_spec.rb
|
335
|
-
- spec/lib/vanagon/utilities_spec.rb
|
336
|
-
- spec/lib/vanagon/common/user_spec.rb
|
337
|
-
- spec/lib/vanagon/common/pathname_spec.rb
|
338
336
|
- spec/lib/vanagon/cli_spec.rb
|
339
|
-
- spec/lib/vanagon/
|
340
|
-
- spec/lib/vanagon/platform/solaris_11_spec.rb
|
341
|
-
- spec/lib/vanagon/platform/osx_spec.rb
|
342
|
-
- spec/lib/vanagon/platform/deb_spec.rb
|
343
|
-
- spec/lib/vanagon/platform/rpm/aix_spec.rb
|
344
|
-
- spec/lib/vanagon/platform/rpm_spec.rb
|
345
|
-
- spec/lib/vanagon/platform/windows_spec.rb
|
346
|
-
- spec/lib/vanagon/platform/dsl_spec.rb
|
337
|
+
- spec/lib/vanagon/utilities_spec.rb
|
347
338
|
- spec/lib/vanagon/project/dsl_spec.rb
|
348
339
|
- spec/lib/vanagon/driver_spec.rb
|
349
|
-
- spec/lib/vanagon/component_spec.rb
|
350
|
-
- spec/lib/vanagon/environment_spec.rb
|
351
340
|
- spec/lib/vanagon/platform_spec.rb
|
352
|
-
- spec/lib/vanagon/engine/base_spec.rb
|
353
|
-
- spec/lib/vanagon/engine/hardware_spec.rb
|
354
|
-
- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
|
355
|
-
- spec/lib/vanagon/engine/docker_spec.rb
|
356
|
-
- spec/lib/vanagon/engine/local_spec.rb
|
357
|
-
- spec/lib/vanagon/engine/ec2_spec.rb
|
358
|
-
- spec/lib/vanagon/engine/pooler_spec.rb
|
359
341
|
- spec/lib/vanagon/component/source/rewrite_spec.rb
|
342
|
+
- spec/lib/vanagon/component/source/git_spec.rb
|
360
343
|
- spec/lib/vanagon/component/source/http_spec.rb
|
361
344
|
- spec/lib/vanagon/component/source/local_spec.rb
|
362
|
-
- spec/lib/vanagon/component/source/git_spec.rb
|
363
345
|
- spec/lib/vanagon/component/rules_spec.rb
|
364
|
-
- spec/lib/vanagon/component/source_spec.rb
|
365
346
|
- spec/lib/vanagon/component/dsl_spec.rb
|
366
|
-
- spec/lib/
|
367
|
-
- spec/lib/
|
347
|
+
- spec/lib/vanagon/component/source_spec.rb
|
348
|
+
- spec/lib/vanagon/environment_spec.rb
|
349
|
+
- spec/lib/vanagon/platform/rpm/aix_spec.rb
|
350
|
+
- spec/lib/vanagon/platform/windows_spec.rb
|
351
|
+
- spec/lib/vanagon/platform/deb_spec.rb
|
352
|
+
- spec/lib/vanagon/platform/solaris_11_spec.rb
|
353
|
+
- spec/lib/vanagon/platform/rpm_spec.rb
|
354
|
+
- spec/lib/vanagon/platform/osx_spec.rb
|
355
|
+
- spec/lib/vanagon/platform/dsl_spec.rb
|
356
|
+
- spec/lib/vanagon/platform/solaris_10_spec.rb
|
357
|
+
- spec/lib/vanagon/extensions/string_spec.rb
|
358
|
+
- spec/lib/vanagon/extensions/set/json_spec.rb
|
359
|
+
- spec/lib/vanagon/extensions/ostruct/json_spec.rb
|
360
|
+
- spec/lib/vanagon/utilities/extra_files_signer_spec.rb
|
361
|
+
- spec/lib/vanagon/utilities/shell_utilities_spec.rb
|
362
|
+
- spec/lib/vanagon/component_spec.rb
|
363
|
+
- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
|
364
|
+
- spec/lib/vanagon/engine/ec2_spec.rb
|
365
|
+
- spec/lib/vanagon/engine/pooler_spec.rb
|
366
|
+
- spec/lib/vanagon/engine/hardware_spec.rb
|
367
|
+
- spec/lib/vanagon/engine/local_spec.rb
|
368
|
+
- spec/lib/vanagon/engine/docker_spec.rb
|
369
|
+
- spec/lib/vanagon/engine/base_spec.rb
|
370
|
+
- spec/lib/vanagon/common/pathname_spec.rb
|
371
|
+
- spec/lib/vanagon/common/user_spec.rb
|