beaker-puppet 1.18.6 → 1.18.7

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b5a08dd203761a4a5bfda53b7f212ab54fef8d70
4
- data.tar.gz: 21f83faf1e52fc7040c76775249469d4eaf52628
3
+ metadata.gz: bc93e5028e31672afb2e58c12bfb8f59a6efe41e
4
+ data.tar.gz: 56adc5e539944684cf99ebe4673cd521a4f1d8d8
5
5
  SHA512:
6
- metadata.gz: 5995a15e365daa5b940263c03df81ea3c4302b7a2a513cafea25cdeaffb408e17fd70ea3c7213443f53b2b7ec7fdf0ab08aa1712100e3c488022cd55327f5082
7
- data.tar.gz: b256f4840bd77c43cb660e79422ffa6291f55216bab327db13959d6e4e30a8ee3bde35ca886481a5068d8b7db70b83d219f4cf679bcd91c71bf01c6d9f5245bc
6
+ metadata.gz: 851feb7ba00a93fcd5cf9b8efbbb1756803b9f8aee9ed93989165f850e9e386b360c5ad79614a2d0f0ca33f31ae31f1000620496746cf6f4841fbb18e475a8ce
7
+ data.tar.gz: 665f419a0ce73551911840fdf8f551d07db29e4ceac5a7d456c0bdb9ee361d97d8280ffc6e94d52974438b23a8d334593f1655eec029959a894412a11acb7d25
@@ -1,3 +1,3 @@
1
1
  module BeakerPuppet
2
- VERSION = '1.18.6'
2
+ VERSION = '1.18.7'
3
3
  end
@@ -79,62 +79,63 @@ step "Unpack puppet-runtime" do
79
79
  need_to_run ||= (!host['has_runtime'] && !host['use_existing_container'])
80
80
  end
81
81
 
82
- skip_test 'No new hosts to create, skipping' unless need_to_run
83
- dev_builds_url = ENV['DEV_BUILDS_URL'] || 'http://builds.delivery.puppetlabs.net'
84
- branch = ENV['RUNTIME_BRANCH'] || 'master'
85
-
86
- # We want to grab whatever tag has been promoted most recently into the branch
87
- # of puppet-agent that corresponds to whatever component we're working on.
88
- # This will allow us to get the latest runtime package that has passed tests.
89
- runtime_json = "https://raw.githubusercontent.com/puppetlabs/puppet-agent/#{branch}/configs/components/puppet-runtime.json"
90
- runtime_tag = JSON.load(open(runtime_json))['version']
91
-
92
- runtime_url = "#{dev_builds_url}/puppet-runtime/#{runtime_tag}/artifacts/"
93
-
94
- runtime_prefix = "agent-runtime-#{branch}-#{runtime_tag}."
95
- runtime_suffix = ".tar.gz"
96
-
97
- agents.each do |host|
98
- next if host['has_runtime'] || host['use_existing_container']
99
-
100
- platform_tag = host['packaging_platform']
101
- if platform_tag =~ /windows/
102
- # the windows version is hard coded to `2012r2`. Unfortunately,
103
- # `host['packaging_platform']` is hard coded to `2012`, so we have to add
104
- # the `r2` on our own.
105
- platform, version, arch = platform_tag.split('-')
106
- platform_tag = "#{platform}-#{version}r2-#{arch}"
107
- end
108
- tarball_name = runtime_prefix + platform_tag + runtime_suffix
109
-
110
- on host, "curl -Of #{runtime_url}#{tarball_name}"
111
-
112
- case host['platform']
113
- when /windows/
114
- on host, "gunzip -c #{tarball_name} | tar -k -C /cygdrive/c/ -xf -"
115
-
116
- if arch == 'x64'
117
- program_files = 'ProgramFiles64Folder'
118
- else
119
- program_files = 'ProgramFilesFolder'
82
+ if need_to_run
83
+ dev_builds_url = ENV['DEV_BUILDS_URL'] || 'http://builds.delivery.puppetlabs.net'
84
+ branch = ENV['RUNTIME_BRANCH'] || 'master'
85
+
86
+ # We want to grab whatever tag has been promoted most recently into the branch
87
+ # of puppet-agent that corresponds to whatever component we're working on.
88
+ # This will allow us to get the latest runtime package that has passed tests.
89
+ runtime_json = "https://raw.githubusercontent.com/puppetlabs/puppet-agent/#{branch}/configs/components/puppet-runtime.json"
90
+ runtime_tag = JSON.load(open(runtime_json))['version']
91
+
92
+ runtime_url = "#{dev_builds_url}/puppet-runtime/#{runtime_tag}/artifacts/"
93
+
94
+ runtime_prefix = "agent-runtime-#{branch}-#{runtime_tag}."
95
+ runtime_suffix = ".tar.gz"
96
+
97
+ agents.each do |host|
98
+ next if host['has_runtime'] || host['use_existing_container']
99
+
100
+ platform_tag = host['packaging_platform']
101
+ if platform_tag =~ /windows/
102
+ # the windows version is hard coded to `2012r2`. Unfortunately,
103
+ # `host['packaging_platform']` is hard coded to `2012`, so we have to add
104
+ # the `r2` on our own.
105
+ platform, version, arch = platform_tag.split('-')
106
+ platform_tag = "#{platform}-#{version}r2-#{arch}"
120
107
  end
121
- if branch == '5.5.x'
122
- bindir = "/cygdrive/c/#{program_files}/PuppetLabs/Puppet/sys/ruby/bin"
108
+ tarball_name = runtime_prefix + platform_tag + runtime_suffix
109
+
110
+ on host, "curl -Of #{runtime_url}#{tarball_name}"
111
+
112
+ case host['platform']
113
+ when /windows/
114
+ on host, "gunzip -c #{tarball_name} | tar -k -C /cygdrive/c/ -xf -"
115
+
116
+ if arch == 'x64'
117
+ program_files = 'ProgramFiles64Folder'
118
+ else
119
+ program_files = 'ProgramFilesFolder'
120
+ end
121
+ if branch == '5.5.x'
122
+ bindir = "/cygdrive/c/#{program_files}/PuppetLabs/Puppet/sys/ruby/bin"
123
+ else
124
+ bindir = "/cygdrive/c/#{program_files}/PuppetLabs/Puppet/puppet/bin"
125
+ end
126
+ on host, "chmod 755 #{bindir}/*"
127
+
128
+ # Because the runtime archive for windows gets installed in a non-standard
129
+ # directory (ProgramFiles64Folder), we need to add it to the path here
130
+ # rather than rely on `host['privatebindir']` like we can for other
131
+ # platforms
132
+ host.add_env_var('PATH', bindir)
133
+ when /osx/
134
+ on host, "tar -xzf #{tarball_name}"
135
+ on host, "for d in opt var private; do rsync -ka \"${d}/\" \"/${d}/\"; done"
123
136
  else
124
- bindir = "/cygdrive/c/#{program_files}/PuppetLabs/Puppet/puppet/bin"
137
+ on host, "gunzip -c #{tarball_name} | #{tar} -k -C / -xf -"
125
138
  end
126
- on host, "chmod 755 #{bindir}/*"
127
-
128
- # Because the runtime archive for windows gets installed in a non-standard
129
- # directory (ProgramFiles64Folder), we need to add it to the path here
130
- # rather than rely on `host['privatebindir']` like we can for other
131
- # platforms
132
- host.add_env_var('PATH', bindir)
133
- when /osx/
134
- on host, "tar -xzf #{tarball_name}"
135
- on host, "for d in opt var private; do rsync -ka \"${d}/\" \"/${d}/\"; done"
136
- else
137
- on host, "gunzip -c #{tarball_name} | #{tar} -k -C / -xf -"
138
139
  end
139
140
  end
140
141
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker-puppet
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.18.6
4
+ version: 1.18.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppet
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-07-15 00:00:00.000000000 Z
11
+ date: 2019-07-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec