sambot 0.1.142 → 0.1.143
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/sambot/chef/kitchen.rb +5 -7
- data/lib/sambot/templates/teamcity.sh.erb +3 -1
- data/lib/sambot/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6e3aa4f0ea76eb8b6060e2147078c14e653df59c
|
4
|
+
data.tar.gz: 3f1de1803592a03fa8368c88b14d184cab4064ff
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e462d21817e5c8cd06c4a80fb9834cf895c064b4ae55a43552bb4b545fd1620ee5b1cb3ffe251fbd070f355453b75379bd095f44c93d33b7555de7fd421c2b79
|
7
|
+
data.tar.gz: d67e4515c2fa6e49d65abb4b9efb3edd3d23b0e283f6bf627235458de95b11fa488449f32fad99235721ba8c093a5270d796929ff52c0b936c7c58ef8300dd46
|
data/lib/sambot/chef/kitchen.rb
CHANGED
@@ -47,7 +47,7 @@ module Sambot
|
|
47
47
|
|
48
48
|
def add_platform_identifier(value, platform)
|
49
49
|
value['suites'].each do |config|
|
50
|
-
params =
|
50
|
+
params = handle_custom_suites(config, platform)
|
51
51
|
params['attributes'] = params['attributes'] || {}
|
52
52
|
params['attributes']['cloud_platform'] = platform
|
53
53
|
params['attributes']['vault'] = params['attributes']['vault'] || {}
|
@@ -55,12 +55,10 @@ module Sambot
|
|
55
55
|
end
|
56
56
|
end
|
57
57
|
|
58
|
-
def
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
config
|
63
|
-
end
|
58
|
+
def handle_customized_runlists(config, platform)
|
59
|
+
runlist = config['runlist']
|
60
|
+
return runlist if runlist.is_a?(Array)
|
61
|
+
platform == 'LOCAL' ? runlist['local'] : runlist['dev']
|
64
62
|
end
|
65
63
|
|
66
64
|
def read_template(template, cookbook_name, platforms)
|
@@ -18,7 +18,9 @@ set +e
|
|
18
18
|
chef exec kitchen verify <%= ENV['TEST_KITCHEN_PLATFORM'] || '' %> -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
|
19
19
|
chef exec kitchen destroy <%= ENV['TEST_KITCHEN_PLATFORM'] || '' %> -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
|
20
20
|
<% else %>
|
21
|
-
|
21
|
+
<% unless ENV['SKIP_TESTING_AS_EMERGENCY'] %>
|
22
|
+
chef exec kitchen create <%= ENV['TEST_KITCHEN_PLATFORM'] || '' %> -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
|
23
|
+
sleep 60
|
22
24
|
chef exec kitchen test <%= ENV['TEST_KITCHEN_PLATFORM'] || '' %> -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
|
23
25
|
RETVAL=$?
|
24
26
|
if [ $RETVAL -eq 0 ] ; then
|
data/lib/sambot/version.rb
CHANGED