vmpooler 1.1.1 → 1.1.2
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.
- checksums.yaml +4 -4
- data/lib/vmpooler/api/v1.rb +13 -0
- data/lib/vmpooler/pool_manager.rb +0 -12
- data/lib/vmpooler/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0e7864a4052aa108e7946af16f5388c43d2f755b55a45cd04e5c1aa808209fe7
|
|
4
|
+
data.tar.gz: b11cc686a8f1ea02551ee874b67f98d70b621848865fdde8acdb6bb1b43e716e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6e20f396405f1eaad295555312603977242b5803466ef0049de517efae3d0098edda2d51bf85e1168e9b5c188364b8fdab8c9e8b5197bd5e2970109d148f838c
|
|
7
|
+
data.tar.gz: 54c61501623bee35381b7e4241d98b00ad0cee8f8904d5ba20edabd6bc942a69c6cfcc11e8bbc8e23429da661ccb0f027e13e83452ad98327c48a210075b3ce8
|
data/lib/vmpooler/api/v1.rb
CHANGED
|
@@ -236,12 +236,25 @@ module Vmpooler
|
|
|
236
236
|
result
|
|
237
237
|
end
|
|
238
238
|
|
|
239
|
+
def component_to_test(match, labels_string)
|
|
240
|
+
return if labels_string.nil?
|
|
241
|
+
|
|
242
|
+
labels_string_parts = labels_string.split(',')
|
|
243
|
+
labels_string_parts.each do |part|
|
|
244
|
+
key, value = part.split('=')
|
|
245
|
+
next if value.nil?
|
|
246
|
+
return value if key == match
|
|
247
|
+
end
|
|
248
|
+
'none'
|
|
249
|
+
end
|
|
250
|
+
|
|
239
251
|
def update_user_metrics(operation, vmname)
|
|
240
252
|
backend.multi
|
|
241
253
|
backend.hget("vmpooler__vm__#{vmname}", 'tag:jenkins_build_url')
|
|
242
254
|
backend.hget("vmpooler__vm__#{vmname}", 'token:user')
|
|
243
255
|
backend.hget("vmpooler__vm__#{vmname}", 'template')
|
|
244
256
|
jenkins_build_url, user, poolname = backend.exec
|
|
257
|
+
poolname = poolname.gsub('.', '_')
|
|
245
258
|
|
|
246
259
|
if user
|
|
247
260
|
user = user.gsub('.', '_')
|
|
@@ -478,18 +478,6 @@ module Vmpooler
|
|
|
478
478
|
dereference_mutex(vm)
|
|
479
479
|
end
|
|
480
480
|
|
|
481
|
-
def component_to_test(match, labels_string)
|
|
482
|
-
return if labels_string.nil?
|
|
483
|
-
|
|
484
|
-
labels_string_parts = labels_string.split(',')
|
|
485
|
-
labels_string_parts.each do |part|
|
|
486
|
-
key, value = part.split('=')
|
|
487
|
-
next if value.nil?
|
|
488
|
-
return value if key == match
|
|
489
|
-
end
|
|
490
|
-
'none'
|
|
491
|
-
end
|
|
492
|
-
|
|
493
481
|
def purge_unused_vms_and_folders
|
|
494
482
|
global_purge = $config[:config]['purge_unconfigured_folders']
|
|
495
483
|
providers = $config[:providers].keys
|
data/lib/vmpooler/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: vmpooler
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.1.
|
|
4
|
+
version: 1.1.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Puppet
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2021-08-
|
|
11
|
+
date: 2021-08-25 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: concurrent-ruby
|