kitchen-ec2 3.7.2 → 3.8.0

This diff has not been reviewed by any users.
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
  SHA256:
3
- metadata.gz: 0f0f97881aef017104ee3af2f9577a1303495d3f29dd46a8cf22c491e179022b
4
- data.tar.gz: caf442b23b9b8ed51149f9ca5af1aaa41112d47b21ac6e2b00e3167d21506ad2
3
+ metadata.gz: 34d9b99c9fe048be513d606f50abb1318d6aa71541fa720308770311d1066a75
4
+ data.tar.gz: abb3e57324a99271ade0ea238ac759e0790934b727729d74ab6cc7f0887f6997
5
5
  SHA512:
6
- metadata.gz: 9e017c01b5a5a9ef3c811c92016bd72c83d108dd08836ed55fc4ee689f63813768f9b9c9a70131be64d29e89c0f1eb1c88951c7ff0c3ae01177f9cd56fb30029
7
- data.tar.gz: f020ac63fb41ee6b51b1829ec2a8b5122876ebfb8c0bca669b1872fc9e5a5108f332b02d3de2b008d079c7833bb6fee68957249fbbebfa7b30ab062c6ce50b12
6
+ metadata.gz: f829ebf7964c3588642d6cfd20ca78152098bc3ed700ca839d443c934b46b5ee61afcb7ee713ef2b2cc4acc9921d550c03e1de2914be3265852d56b554bbe050
7
+ data.tar.gz: 9600e83fcde5acf5e9e98b91cf9e44033fa1aa405aec192ee5774fc1ea6ec4afc8f03cb485be8766a1f0804a4ab9a349f8353851c92348a53c60f8b5c3f3a2c5
@@ -473,7 +473,6 @@ module Kitchen
473
473
  debug("Creating EC2 Spot Instance..")
474
474
  instance_data = instance_generator.ec2_instance_data
475
475
 
476
- request_duration = config[:spot_wait]
477
476
  config_spot_price = config[:spot_price].to_s
478
477
  if %w{ondemand on-demand}.include?(config_spot_price)
479
478
  spot_price = ""
@@ -481,9 +480,10 @@ module Kitchen
481
480
  spot_price = config_spot_price
482
481
  end
483
482
  spot_options = {
484
- spot_instance_type: "persistent", # Cannot use one-time with valid_until
485
- valid_until: Time.now + request_duration,
486
- instance_interruption_behavior: "stop",
483
+ # Must use one-time in order to use instance_interruption_behavior=terminate
484
+ # spot_instance_type: "one-time", # default
485
+ # Must use instance_interruption_behavior=terminate in order to use block_duration_minutes
486
+ # instance_interruption_behavior: "terminate", # default
487
487
  }
488
488
  if config[:block_duration_minutes]
489
489
  spot_options[:block_duration_minutes] = config[:block_duration_minutes]
@@ -785,7 +785,9 @@ module Kitchen
785
785
  ip_protocol: "tcp",
786
786
  from_port: port,
787
787
  to_port: port,
788
- ip_ranges: [{ cidr_ip: config[:security_group_cidr_ip] }],
788
+ ip_ranges: Array(config[:security_group_cidr_ip]).map do |cidr_ip|
789
+ { cidr_ip: cidr_ip }
790
+ end,
789
791
  }
790
792
  end
791
793
  )
@@ -21,6 +21,6 @@ module Kitchen
21
21
  module Driver
22
22
 
23
23
  # Version string for EC2 Test Kitchen driver
24
- EC2_VERSION = "3.7.2".freeze
24
+ EC2_VERSION = "3.8.0".freeze
25
25
  end
26
26
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kitchen-ec2
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.7.2
4
+ version: 3.8.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Fletcher Nichol
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-09-29 00:00:00.000000000 Z
11
+ date: 2020-10-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: test-kitchen
@@ -126,14 +126,14 @@ dependencies:
126
126
  requirements:
127
127
  - - '='
128
128
  - !ruby/object:Gem::Version
129
- version: 1.4.0
129
+ version: 1.4.4
130
130
  type: :development
131
131
  prerelease: false
132
132
  version_requirements: !ruby/object:Gem::Requirement
133
133
  requirements:
134
134
  - - '='
135
135
  - !ruby/object:Gem::Version
136
- version: 1.4.0
136
+ version: 1.4.4
137
137
  - !ruby/object:Gem::Dependency
138
138
  name: climate_control
139
139
  requirement: !ruby/object:Gem::Requirement
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
189
189
  - !ruby/object:Gem::Version
190
190
  version: '0'
191
191
  requirements: []
192
- rubygems_version: 3.1.2
192
+ rubygems_version: 3.1.4
193
193
  signing_key:
194
194
  specification_version: 4
195
195
  summary: A Test Kitchen Driver for Amazon EC2