xp5k 0.0.8 → 0.0.9

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 (4) hide show
  1. checksums.yaml +8 -8
  2. data/lib/xp5k/version.rb +1 -1
  3. data/lib/xp5k/xp.rb +6 -0
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- YjgzNjJkOTZkZDk5YzVkZGZkYjM2OTE3ZTU5ZjFkMzlmNjMxMDY5Yw==
4
+ ODk0OGNhZDYyNmE4OGIwNTdjYTlhYjYxNzZjN2Q1YmY3ZGZiNjFmMA==
5
5
  data.tar.gz: !binary |-
6
- MmE0NThhMjQ1MzhiOGEwYjQzYTc1Njg1MGRiNjgzYWRhY2Y4MGU2ZA==
6
+ YzY0YTc1OTk0NTAzMzE4ZTU4ODI0M2VmMTc4ODZiMGU2NDJlMTFmMw==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- ZDNkN2RiOTczNDI1NjA2NDQ0NGY2Y2E2ZmEyYWNkM2U5MWUyYjI5YWZlOTlm
10
- Y2M4NzUzNTJlNmU3OWY5MmQyZGIwZThiZDUzMjY5NmE4ZTU5NmM2NzYzNzU0
11
- MzIwYWVjNTIyYzNjYTI3Y2FmMDBmYWNiYzA5ZTcwYTA1ZDIyNWU=
9
+ MjkwZjViNDRkODllMjIyNmMxMmFlMDJiZmU5YTgyNzU0ODgxZTI3NDY4YTJk
10
+ M2VhZWM4N2JlMGZhN2E5NzU0ZGNkZDk0Zjk2Zjg1MmIwNWVhMzQ0YWM3NWNm
11
+ MjBkZmY1ZTdlY2IzYzJlZTMwMTdiODk4Y2ExOTYwYjVhMTBiYjM=
12
12
  data.tar.gz: !binary |-
13
- ZDAzOGY0NTliZDY0NzNlZDJiYTM4NjhhYTk2ZTllNGI2ZGU3YzJjYjc1Zjkx
14
- YTliY2M5YjkzMmNlZTJjNDVmMTFjMDg3ZThlNWRkMmM4ODc1ZGRjMzkwNDFh
15
- YWU0NDEyMWExYWM3MmVlNGNiNDk2ZDc2MjhhZWNmMDAwMmNmOGQ=
13
+ YTEzYjBiYWJjMGQ4YzA1ZjhhYTgyNTY2NjI0MjgwZmFhYzg2ODlmMjI5YmM2
14
+ NThmYjg5MjQ2NWY5MWEzZjgwYmZiYTI5OTJlM2QwYTY2ZDJiODkzZGFlMWI0
15
+ NzRlMzE0YzEyNjg3M2FiMzIxYzUxZDBkOGUyZDVkZjU5YjBjMjg=
data/lib/xp5k/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module XP5K
2
- VERSION='0.0.8'
2
+ VERSION='0.0.9'
3
3
  end
data/lib/xp5k/xp.rb CHANGED
@@ -66,6 +66,10 @@ module XP5K
66
66
  # set retries
67
67
  x[:retry] ||= false
68
68
  x[:retries] ||= x[:retry]?@retries:1
69
+ # Manage vlan on primary interface
70
+ if vlan_from_job = x[:vlan_from_job]
71
+ x[:vlan] = self.job_with_name(vlan_from_job)['resources_by_type']['vlans'].first.to_i
72
+ end
69
73
  end
70
74
  internal_deploy(@retries)
71
75
  print_deploy_summary
@@ -160,6 +164,7 @@ module XP5K
160
164
  self.jobs.each.with_index do |job, id|
161
165
  log = "Job \"#{job["name"]}\" #{job["uid"]}@#{jobs2submit[id][:site]} status : #{job["state"]}"
162
166
  log += " (#{Time.at(job['scheduled_at'].to_i).to_datetime})" if job['state'] == 'waiting'
167
+ log += " (until #{Time.at(job['started_at'].to_i + job['walltime'].to_i).to_datetime})" if job['state'] == 'running'
163
168
  logger.info log
164
169
  end
165
170
  end
@@ -275,6 +280,7 @@ module XP5K
275
280
  site = x[:site]
276
281
  x.delete(:site)
277
282
  x.delete(:roles)
283
+ x.delete(:vlan_from_job)
278
284
  x.delete(:jobs)
279
285
  x.delete(:assigned_nodes)
280
286
  x.delete(:goal)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: xp5k
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.8
4
+ version: 0.0.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pascal Morillon
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-10-28 00:00:00.000000000 Z
11
+ date: 2015-01-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: restfully