bake-toolkit 2.37.5 → 2.37.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/bin/bakeqac +5 -3
  3. data/lib/common/version.rb +1 -1
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6f3b4cee6c07be983597ace82ec90b63b61e88a1
4
- data.tar.gz: 668982ce0264a542293ce4dbd7d82af17bed76ac
3
+ metadata.gz: 44a4376dcaeacdba3b5a9fbb5ff2c0d9f9a2ae81
4
+ data.tar.gz: d71e27eae209295de653c1f3b1fbf708301edb4b
5
5
  SHA512:
6
- metadata.gz: 163cf66d2afc08594ffcca8840505a7d99fc56a55db294d2ff98aa1a5558941bc0ddc014ea21f45a7749ca16f5d8d0dac0235c9d8638ba58b5d70ec65513b2cf
7
- data.tar.gz: 7c4c93a9014a7e5405d01033500b6049f5eee52859c2e97dd7081be2eee5e0a57304ce92a22478cd39cb0ef78d360a44a6d2ec121bf450bc614544f4242ef9ab
6
+ metadata.gz: 58f8ca280be6830ff4b466b8c4c60d23cee430b7ca22d4aa7e2b37f071e601d6647f6e167eb61405632bf43a5877b814c47ec93294c49aec3c041ade925ccfcd
7
+ data.tar.gz: 16e12e4a3263484082c9432c64bed7cb74f684052cc6abd77ad35a33042d8598b4b27f4a9207ab49ddf63d594dc8f3e541382a6ec62792473fae83b854db7965
@@ -46,6 +46,7 @@ def self.executeQacli(cmd, adminStepAndImmediateOutput = false)
46
46
 
47
47
  loop do
48
48
  FileUtils.rm_rf @options.qacdata if adminStepAndImmediateOutput
49
+
49
50
  # admin step should not take longer than 60 seconds, rest not longer than 80% of qacretry time if specified
50
51
  success, consoleOutput = ProcessHelper.run(cmd, adminStepAndImmediateOutput, true, nil, [0], Dir.pwd, adminStepAndImmediateOutput ? 60 : (@options.qacretry * 0.8).to_i)
51
52
  licenseError = false
@@ -63,17 +64,18 @@ def self.executeQacli(cmd, adminStepAndImmediateOutput = false)
63
64
  puts "bakeqac: Unable to connect to QAX Daemon!"
64
65
  break
65
66
  end
66
- if (line.include?("Process timeout"))
67
- puts "bakeqac: Process takes too long!"
67
+ if (line.include?("Process timeout") || line.include?("A mutually exclusive operation is in progress"))
68
+ puts line
69
+ puts "Seconds left after killing process: %d" % (@options.qacretry - (Time.now - timeStart))
68
70
  processTimeout = true
69
71
  puts "bakeqac: Removing locks from #{@options.qacdata}..."
70
72
  sleep(1)
71
73
  successRemove, consoleOutput = ProcessHelper.run($cmdRemoveLocks, false)
74
+ puts "Seconds left after removing locks: %d" % (@options.qacretry - (Time.now - timeStart))
72
75
  puts consoleOutput unless consoleOutput.empty?
73
76
  break
74
77
  end
75
78
  end
76
-
77
79
  cSizeCheck = checkCipSize()
78
80
 
79
81
  break unless ((@options.qacretry >= (Time.now - timeStart)) && (!cSizeCheck || licenseError || qacDaemonError || processTimeout))
@@ -1,7 +1,7 @@
1
1
  module Bake
2
2
  class Version
3
3
  def self.number
4
- "2.37.5"
4
+ "2.37.6"
5
5
  end
6
6
 
7
7
  def self.printBakeVersion(ry = "")
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bake-toolkit
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.37.5
4
+ version: 2.37.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alexander Schaal
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-05-30 00:00:00.000000000 Z
11
+ date: 2017-05-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rtext