kitchen-zcloudjp 0.3.3 → 0.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/.gitignore +4 -0
- data/CANGELOG.md +7 -0
- data/README.md +3 -0
- data/kitchen-zcloudjp.gemspec +2 -2
- data/lib/kitchen/driver/zcloudjp.rb +33 -24
- data/lib/kitchen/driver/zcloudjp_version.rb +1 -1
- metadata +9 -8
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
NDI5Mzk1ZTRhN2QxNjg0YjA5M2I2ZWIwNDFlZmZjZjRjNGI3YTNlNg==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
ZjI2NzUyY2M2MDFiMzZjYjFlZDMwZjlhNjZjN2I4YWQxNmUwZWFmMg==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
MjljOWExNWI1YTcwNWZjZmM3Nzc2ZjkxYjRhYzMyOTBhMTIzMTE5OTFlM2Q2
|
10
|
+
MzYwOGJhNzU5MjNlN2ZjOGM3NzE1MTNiNmMwYmZiMTY3ZjdmZmQwODQ4MjE3
|
11
|
+
Y2MxODA0YzYyOTNhM2ZiNzdmYzg3OGEwNzJhYTFiMzQ1NmY1ZjM=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
NmY1MjYyY2FkMGUxYWVhMjkyMTU5MmI4YmM0ODRiM2UzOWY5MDAxY2VhMTYy
|
14
|
+
N2Y4YjM2NGEwNjVjYTA2OTY3MGQ4MDg2N2EyNjZkY2Q0ZmMyNjU2YWIyYjlh
|
15
|
+
MWI3NzdiNmZmYTZhNmUyMzU3NzMxZTA4NmVjYzQ4NTMwOTBmZjA=
|
data/.gitignore
CHANGED
data/CANGELOG.md
ADDED
data/README.md
CHANGED
data/kitchen-zcloudjp.gemspec
CHANGED
@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
|
|
18
18
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
19
19
|
spec.require_paths = ['lib']
|
20
20
|
|
21
|
-
spec.add_dependency 'test-kitchen', '
|
21
|
+
spec.add_dependency 'test-kitchen', '~> 1.1.0'
|
22
22
|
spec.add_dependency 'zcloudjp'
|
23
23
|
|
24
|
-
spec.add_development_dependency 'bundler', '~> 1.
|
24
|
+
spec.add_development_dependency 'bundler', '~> 1.5'
|
25
25
|
spec.add_development_dependency 'rake'
|
26
26
|
|
27
27
|
spec.add_development_dependency 'cane'
|
@@ -23,13 +23,14 @@ require 'benchmark'
|
|
23
23
|
require 'kitchen'
|
24
24
|
require 'kitchen/busser'
|
25
25
|
|
26
|
+
|
26
27
|
module Kitchen
|
27
28
|
|
28
29
|
module Driver
|
29
30
|
class Zcloudjp < Kitchen::Driver::SSHBase
|
30
31
|
default_config :dataset, 'sdc:sdc:base64:13.1.0' # base64 image
|
31
32
|
default_config :package, 'Small_1GB'
|
32
|
-
default_config :with_gcc,
|
33
|
+
default_config :with_gcc, true
|
33
34
|
|
34
35
|
required_config :api_key
|
35
36
|
|
@@ -53,12 +54,8 @@ module Kitchen
|
|
53
54
|
ssh_args = build_ssh_args(state)
|
54
55
|
sleep 5 until wait_for_sshd_vm(ssh_args)
|
55
56
|
print "(ssh ready)\n"
|
56
|
-
## Override ruby_binpath to default
|
57
|
-
::Kitchen::Busser.const_set(:DEFAULT_RUBY_BINPATH, '/opt/chef/embedded/bin')
|
58
57
|
else
|
59
58
|
wait_for_sshd_vm(ssh_args) ; print "(ssh ready)\n"
|
60
|
-
## Override ruby_binpath
|
61
|
-
::Kitchen::Busser.const_set(:DEFAULT_RUBY_BINPATH, '/opt/local/bin')
|
62
59
|
end
|
63
60
|
end
|
64
61
|
|
@@ -80,25 +77,9 @@ module Kitchen
|
|
80
77
|
end
|
81
78
|
|
82
79
|
|
83
|
-
def setup(state)
|
84
|
-
server = client.machine.show(:id => state[:server_id])
|
85
|
-
unless server.os == "SmartOS"
|
86
|
-
## Override ruby_binpath to default
|
87
|
-
::Kitchen::Busser.const_set(:DEFAULT_RUBY_BINPATH, '/opt/chef/embedded/bin')
|
88
|
-
else
|
89
|
-
## Override ruby_binpath
|
90
|
-
::Kitchen::Busser.const_set(:DEFAULT_RUBY_BINPATH, '/opt/local/bin')
|
91
|
-
end
|
92
|
-
|
93
|
-
Kitchen::SSH.new(*build_ssh_args(state)) do |conn|
|
94
|
-
debug(busser_setup_cmd)
|
95
|
-
run_remote(busser_setup_cmd, conn)
|
96
|
-
end
|
97
|
-
end
|
98
|
-
|
99
|
-
|
100
80
|
def converge(state)
|
101
|
-
provisioner =
|
81
|
+
provisioner = instance.provisioner
|
82
|
+
sandbox_dirs = Dir.glob("#{provisioner.create_sandbox}/*")
|
102
83
|
|
103
84
|
server = client.machine.show(:id => state[:server_id])
|
104
85
|
info("--> Updating metadata...")
|
@@ -115,8 +96,10 @@ module Kitchen
|
|
115
96
|
Kitchen::SSH.new(*build_ssh_args(state)) do |conn|
|
116
97
|
run_remote(provisioner.install_command, conn)
|
117
98
|
run_remote(provisioner.init_command, conn)
|
118
|
-
transfer_path(
|
99
|
+
transfer_path(sandbox_dirs, provisioner[:root_path], conn)
|
119
100
|
run_remote(provisioner.prepare_command, conn)
|
101
|
+
puts provisioner[:test_base_path]
|
102
|
+
puts '-------------'
|
120
103
|
run_remote(provisioner.run_command, conn)
|
121
104
|
end
|
122
105
|
ensure
|
@@ -192,3 +175,29 @@ module Kitchen
|
|
192
175
|
end
|
193
176
|
end
|
194
177
|
end
|
178
|
+
|
179
|
+
|
180
|
+
module Kitchen
|
181
|
+
class Busser
|
182
|
+
class_eval do
|
183
|
+
alias :orig_setup_cmd :setup_cmd
|
184
|
+
def setup_cmd
|
185
|
+
@setup_cmd ||= if local_suite_files.empty?
|
186
|
+
nil
|
187
|
+
else
|
188
|
+
setup_cmd = []
|
189
|
+
setup_cmd << busser_setup_env
|
190
|
+
setup_cmd << "if ! #{sudo}#{config[:ruby_bindir]}/gem list busser -i >/dev/null"
|
191
|
+
setup_cmd << "then #{sudo}#{config[:ruby_bindir]}/gem install #{gem_install_args}"
|
192
|
+
setup_cmd << "fi"
|
193
|
+
setup_cmd << "gem_bindir=`#{config[:ruby_bindir]}/ruby -rrubygems -e \"puts Gem.bindir\"`"
|
194
|
+
setup_cmd << "#{sudo}${gem_bindir}/busser setup"
|
195
|
+
setup_cmd << "#{sudo}sed -e 's@sh@bash@' #{config[:busser_bin]} -i"
|
196
|
+
setup_cmd << "#{sudo}#{config[:busser_bin]} plugin install #{plugins.join(' ')}"
|
197
|
+
|
198
|
+
"bash -c '#{setup_cmd.join('; ')}'"
|
199
|
+
end
|
200
|
+
end
|
201
|
+
end
|
202
|
+
end
|
203
|
+
end
|
metadata
CHANGED
@@ -1,29 +1,29 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kitchen-zcloudjp
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.4.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- sawanoboly
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-02-
|
11
|
+
date: 2014-02-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: test-kitchen
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- -
|
17
|
+
- - ~>
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 1.
|
19
|
+
version: 1.1.0
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- -
|
24
|
+
- - ~>
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 1.
|
26
|
+
version: 1.1.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: zcloudjp
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -44,14 +44,14 @@ dependencies:
|
|
44
44
|
requirements:
|
45
45
|
- - ~>
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: '1.
|
47
|
+
version: '1.5'
|
48
48
|
type: :development
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - ~>
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: '1.
|
54
|
+
version: '1.5'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: rake
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -116,6 +116,7 @@ extensions: []
|
|
116
116
|
extra_rdoc_files: []
|
117
117
|
files:
|
118
118
|
- .gitignore
|
119
|
+
- CANGELOG.md
|
119
120
|
- Gemfile
|
120
121
|
- LICENSE.txt
|
121
122
|
- README.md
|