beaker-abs 0.2.0 → 0.3.0

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.
Files changed (5) hide show
  1. checksums.yaml +5 -13
  2. data/HISTORY.md +19 -2
  3. data/lib/beaker-abs/version.rb +1 -1
  4. data/lib/beaker/hypervisor/abs.rb +28 -1
  5. metadata +17 -17
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- ZTg4M2E4ZGUxNWQzMDM0MDFhYjlhMDY4YWFhNWI3ODk2ZGY1NDE4Ng==
5
- data.tar.gz: !binary |-
6
- ZGUwOWJhZDZmMWE1YmNkYjBhYmEzNzIwZTc4MjRjZGExZmM5OTRmNA==
2
+ SHA1:
3
+ metadata.gz: 7368f79fad3e2f153910b013aa69eca32d05970d
4
+ data.tar.gz: dd38119800e44a48abe03b50fbb15c61400c293c
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- NmI2YWJjOTA0ZTRkYWE4ZTE3MjVmZTBkNDBiOTIyYmNhNzk5NzVlYTIzMmYy
10
- YjVmMTYyYTBmMDBmZGZlMzg4NDg4ZDU2YTNiYzQ3NzA1NWQ2NWVhOTQxOWFk
11
- NTJmZDQ2MzVlNWVjNGYyZGVjNzZhODA5NzU2YTEyNjQ1M2VkYmI=
12
- data.tar.gz: !binary |-
13
- N2Q0MmViY2I0NmQxNGY3MGU4YjRiZmZiYzFkOTY1ZWQwNGIwNTYxNmYzMjJi
14
- OWI5MzE1NDgxOGNkZWJkNDYwYmVkYjE0N2FiMDI5NmRmNzJiODhhNWY4MDI4
15
- ZGMzZTYyY2VlZWQ1MWM2NDdmZWViZDBhNmI4NTg1MWU2ZGQ1ZDc=
6
+ metadata.gz: 1f6259cefad7b1939cfa66b60b39eaa7c681ce229643ec7bb2c9180aba436c3e29abc692d34fe477bf21fdbbcaa34e470b72ff40a7de1059d8b08bc4bf071eab
7
+ data.tar.gz: 72fde57f1d1a73104e1a544c890537d07ab373a31e763911961aff3d295617899cc2488a6656022120058048a9867c01857a9473a82cc533d6e18896c9c585dc
data/HISTORY.md CHANGED
@@ -1,12 +1,29 @@
1
1
  # qe_beaker-abs_bump_and_tag_master - History
2
2
  ## Tags
3
- * [LATEST - 24 Oct, 2016 (4c14d730)](#LATEST)
3
+ * [LATEST - 14 Aug, 2017 (26840bd3)](#LATEST)
4
+ * [0.2.0 - 24 Oct, 2016 (44ff3935)](#0.2.0)
4
5
  * [0.1.3 - 16 Sep, 2016 (6f1ced08)](#0.1.3)
5
6
  * [0.1.2 - 16 Sep, 2016 (b914ae60)](#0.1.2)
6
7
  * [0.1.1 - 16 Sep, 2016 (10ee39cf)](#0.1.1)
7
8
 
8
9
  ## Details
9
- ### <a name = "LATEST">LATEST - 24 Oct, 2016 (4c14d730)
10
+ ### <a name = "LATEST">LATEST - 14 Aug, 2017 (26840bd3)
11
+
12
+ * (GEM) update beaker-abs version to 0.3.0 (26840bd3)
13
+
14
+ * Merge pull request #9 from rishijavia/BKR-1155-third_attempt (859cb1ec)
15
+
16
+
17
+ ```
18
+ Merge pull request #9 from rishijavia/BKR-1155-third_attempt
19
+
20
+ (BKR-1155) Override beaker's default ssh connection preference
21
+ ```
22
+ * (BKR-1155) Override beaker's default ssh connection preference (8bab8a1c)
23
+
24
+ ### <a name = "0.2.0">0.2.0 - 24 Oct, 2016 (44ff3935)
25
+
26
+ * (HISTORY) update beaker-abs history for gem release 0.2.0 (44ff3935)
10
27
 
11
28
  * (GEM) update beaker-abs version to 0.2.0 (4c14d730)
12
29
 
data/lib/beaker-abs/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module BeakerAbs
2
2
  module Version
3
- STRING = '0.2.0'
3
+ STRING = '0.3.0'
4
4
  end
5
5
  end
data/lib/beaker/hypervisor/abs.rb CHANGED
@@ -13,15 +13,39 @@ module Beaker
13
13
  @resource_hosts = JSON.parse(resource_hosts)
14
14
  end
15
15
 
16
+ def connection_preference(host)
17
+ vmhostname = host[:vmhostname]
18
+ if vmhostname && host[:hypervisor] == 'abs'
19
+ @resource_hosts.each do |resource_host|
20
+ if resource_host['hostname'] == vmhostname
21
+ engine = resource_host['engine']
22
+ case engine
23
+ when /^(vmpooler|nspooler)$/
24
+ # putting ip last as its not set by ABS
25
+ return [:vmhostname, :hostname, :ip]
26
+ else
27
+ super
28
+ end
29
+ end
30
+ end
31
+ end
32
+ super
33
+ end
34
+
16
35
  def provision
17
36
  type2hosts = {}
18
37
 
19
38
  # Each resource_host is of the form:
20
39
  # {
21
- # "hostname" => "1234567890",
40
+ # "hostname" => "mkbx0m6dnnntgz1.delivery.puppetlabs.net",
22
41
  # "type" => "centos-7-i386",
23
42
  # "engine" => "vmpooler",
24
43
  # }
44
+ # {
45
+ # "hostname" => "sol10-1.delivery.puppetlabs.net",
46
+ # "type" => "solaris-10-sparc",
47
+ # "engine" => "nspooler",
48
+ # }
25
49
  @resource_hosts.each do |resource_host|
26
50
  type = resource_host['type']
27
51
  type2hosts[type] ||= []
@@ -40,6 +64,9 @@ module Beaker
40
64
  raise ArgumentError.new("Failed to provision host '#{host.hostname}', no template of type '#{host['template']}' was provided.")
41
65
  end
42
66
  end
67
+ if Beaker::Hypervisor.respond_to?(:set_ssh_connection_preference)
68
+ Beaker::Hypervisor.set_ssh_connection_preference(@hosts, self)
69
+ end
43
70
  end
44
71
 
45
72
  def cleanup
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker-abs
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josh Cooper
@@ -9,68 +9,68 @@ authors:
9
9
  autorequire:
10
10
  bindir: exe
11
11
  cert_chain: []
12
- date: 2016-10-24 00:00:00.000000000 Z
12
+ date: 2017-08-14 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - ~>
18
+ - - "~>"
19
19
  - !ruby/object:Gem::Version
20
20
  version: '1.12'
21
21
  type: :development
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - ~>
25
+ - - "~>"
26
26
  - !ruby/object:Gem::Version
27
27
  version: '1.12'
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: rake
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - ~>
32
+ - - "~>"
33
33
  - !ruby/object:Gem::Version
34
34
  version: '10.0'
35
35
  type: :development
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - ~>
39
+ - - "~>"
40
40
  - !ruby/object:Gem::Version
41
41
  version: '10.0'
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: minitest
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
- - - ~>
46
+ - - "~>"
47
47
  - !ruby/object:Gem::Version
48
48
  version: '5.0'
49
49
  type: :development
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
- - - ~>
53
+ - - "~>"
54
54
  - !ruby/object:Gem::Version
55
55
  version: '5.0'
56
56
  - !ruby/object:Gem::Dependency
57
57
  name: beaker
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
- - - ! '>='
60
+ - - ">="
61
61
  - !ruby/object:Gem::Version
62
62
  version: 2.9.0
63
- - - <
63
+ - - "<"
64
64
  - !ruby/object:Gem::Version
65
65
  version: '4.0'
66
66
  type: :runtime
67
67
  prerelease: false
68
68
  version_requirements: !ruby/object:Gem::Requirement
69
69
  requirements:
70
- - - ! '>='
70
+ - - ">="
71
71
  - !ruby/object:Gem::Version
72
72
  version: 2.9.0
73
- - - <
73
+ - - "<"
74
74
  - !ruby/object:Gem::Version
75
75
  version: '4.0'
76
76
  description: Adds a custom hypervisor that uses hosts provisioned by the Always Be
@@ -82,8 +82,8 @@ executables: []
82
82
  extensions: []
83
83
  extra_rdoc_files: []
84
84
  files:
85
- - .gitignore
86
- - .travis.yml
85
+ - ".gitignore"
86
+ - ".travis.yml"
87
87
  - Gemfile
88
88
  - HISTORY.md
89
89
  - LICENSE.txt
@@ -104,17 +104,17 @@ require_paths:
104
104
  - lib
105
105
  required_ruby_version: !ruby/object:Gem::Requirement
106
106
  requirements:
107
- - - ! '>='
107
+ - - ">="
108
108
  - !ruby/object:Gem::Version
109
109
  version: '0'
110
110
  required_rubygems_version: !ruby/object:Gem::Requirement
111
111
  requirements:
112
- - - ! '>='
112
+ - - ">="
113
113
  - !ruby/object:Gem::Version
114
114
  version: '0'
115
115
  requirements: []
116
116
  rubyforge_project:
117
- rubygems_version: 2.4.6
117
+ rubygems_version: 2.5.1
118
118
  signing_key:
119
119
  specification_version: 4
120
120
  summary: Let's test Puppet, using hosts provisioned by Always Be Scheduling service.