vmpooler 3.5.0 → 3.5.1
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/v3.rb +3 -5
- data/lib/vmpooler/pool_manager.rb +2 -0
- 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: abc6c0e799944bad6d5f766f21a5fd55038daf2741604a79dbf1dd409a4c6f54
|
|
4
|
+
data.tar.gz: 6977e9af54319329a9a526e0dfea5d39b453c57f391a24782f64fbf70f3cc300
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 33c3cea211a61f072498adbeff5c2ea8b9862e9dee8cac3a38b0f2757492a8df7ed7b8150b7213777b597804c235ea61c12eaeeed5a3c0907053d2f5111746a6
|
|
7
|
+
data.tar.gz: 28785ede40fdc245732195a6beeea9e4bced0c0d85fc54d12bfe6b6e931c50dc1d81942bd540201bcc33ff07ae876114b82524b47567314fbf1e1883e96252a6
|
data/lib/vmpooler/api/v3.rb
CHANGED
|
@@ -283,11 +283,9 @@ module Vmpooler
|
|
|
283
283
|
def update_user_metrics(operation, vmname)
|
|
284
284
|
tracer.in_span("Vmpooler::API::V3.#{__method__}") do |span|
|
|
285
285
|
begin
|
|
286
|
-
backend.
|
|
287
|
-
backend.hget("vmpooler__vm__#{vmname}", '
|
|
288
|
-
backend.hget("vmpooler__vm__#{vmname}", '
|
|
289
|
-
backend.hget("vmpooler__vm__#{vmname}", 'template')
|
|
290
|
-
jenkins_build_url, user, poolname = backend.exec
|
|
286
|
+
jenkins_build_url = backend.hget("vmpooler__vm__#{vmname}", 'tag:jenkins_build_url')
|
|
287
|
+
user = backend.hget("vmpooler__vm__#{vmname}", 'token:user')
|
|
288
|
+
poolname = backend.hget("vmpooler__vm__#{vmname}", 'template')
|
|
291
289
|
poolname = poolname.gsub('.', '_')
|
|
292
290
|
|
|
293
291
|
if user
|
|
@@ -129,6 +129,8 @@ module Vmpooler
|
|
|
129
129
|
already_timed_out = time_since_clone > timeout
|
|
130
130
|
timing_out_soon = time_since_clone > timeout_notification && !redis.hget("vmpooler__vm__#{vm}", 'timeout_notification')
|
|
131
131
|
|
|
132
|
+
return true if !already_timed_out && !timing_out_soon
|
|
133
|
+
|
|
132
134
|
if already_timed_out
|
|
133
135
|
unless exists
|
|
134
136
|
remove_nonexistent_vm(vm, pool, redis)
|
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: 3.5.
|
|
4
|
+
version: 3.5.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Puppet
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2023-08-
|
|
11
|
+
date: 2023-08-24 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|