evrone-ci-worker 0.2.0.pre20 → 0.2.0.pre21

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 (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/evrone/ci/worker/middlewares/docker_script.rb +6 -2
  3. data/lib/evrone/ci/worker/middlewares/update_job_status.rb +3 -1
  4. data/lib/evrone/ci/worker/version.rb +1 -1
  5. data/spec/lib/worker/middlewares/update_job_status_spec.rb +5 -0
  6. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d5a832b47c09dc020a28cd54d6d30413398aebe8
4
- data.tar.gz: da7a2ed9f4ed472df21223113645f8a4b8ff0815
3
+ metadata.gz: ca9ac9ab7de52d2163299b85791e6fdd51c69108
4
+ data.tar.gz: 528f5cd6f25983266ed8b4987e0cc678c7d8196a
5
5
  SHA512:
6
- metadata.gz: e92f3791750e43e098acb9ab3094db886ef5acf92a47e9260c5c9e6395c22316057fbdf59604babeea4136ba9b942e10130955ff75fe11d228b49248abd1bdb1
7
- data.tar.gz: 2eaf92d9e2476392d370b97459889e03627880606aa445c6190edc6c507759d626f36e19aa889e064bf097d80e79183ada9868816ca16c4338e96a3df84cafd9
6
+ metadata.gz: 637ddd3a0c32df67beb8e53ee9b246119219b0e331683623ceb27005816b67341a13a372d709c8e5371e6db143bfd4e67cbad23f0b9d8ddde954c0499f146f01
7
+ data.tar.gz: fb998d122f6437a833b33a75956f6a98fb5123ab3097e338e7d54fe3374a9a0f22dc1608674622a3919033494cf8cc7a9cc315c8ba395b558c411ab0d1c37219
data/lib/evrone/ci/worker/middlewares/docker_script.rb CHANGED
@@ -38,7 +38,7 @@ module Evrone
38
38
  script << "env - HOME=$HOME bash #{file}"
39
39
  script = script.join(" && ")
40
40
 
41
- env.ssh.spawn script, chdir: home, &env.job.method(:add_to_output)
41
+ env.ssh.spawn script, chdir: home, read_timeout: read_timeout, &env.job.method(:add_to_output)
42
42
  end
43
43
 
44
44
  def run_after_script(env)
@@ -49,7 +49,7 @@ module Evrone
49
49
  script << "env - HOME=$HOME bash #{file}"
50
50
  script = script.join(" && ")
51
51
 
52
- env.ssh.spawn script, chdir: home, &env.job.method(:add_to_output)
52
+ env.ssh.spawn script, chdir: home, read_timeout: read_timeout, &env.job.method(:add_to_output)
53
53
  end
54
54
 
55
55
  def script_content(env, home)
@@ -77,6 +77,10 @@ module Evrone
77
77
  buf.strip
78
78
  end
79
79
 
80
+ def read_timeout
81
+ 10 * 60
82
+ end
83
+
80
84
  end
81
85
  end
82
86
  end
data/lib/evrone/ci/worker/middlewares/update_job_status.rb CHANGED
@@ -20,7 +20,9 @@ module Evrone
20
20
  rs = -1
21
21
  begin
22
22
  rs = app.call env
23
- rescue Exception => e
23
+ rescue ::Timeout::Error => e
24
+ env.job.add_to_output("\n\nERROR: #{e.message}\n")
25
+ rescue ::Exception => e
24
26
  env.job.add_to_output("\n\nERROR: #{e.inspect}\n")
25
27
  logger.error("ERROR: #{e.inspect}\n BACKTRACE:\n#{e.backtrace.map{|i| " #{i}" }.join("\n")}")
26
28
  Common::ErrorNotifier.notify(e)
data/lib/evrone/ci/worker/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Evrone
2
2
  module CI
3
3
  module Worker
4
- VERSION = "0.2.0.pre20"
4
+ VERSION = "0.2.0.pre21"
5
5
  end
6
6
  end
7
7
  end
data/spec/lib/worker/middlewares/update_job_status_spec.rb CHANGED
@@ -62,7 +62,12 @@ describe Evrone::CI::Worker::UpdateJobStatus do
62
62
  its(:status) { should eq 5 }
63
63
  end
64
64
  end
65
+ end
66
+
67
+ context "Timeout::Error" do
68
+ let(:app) { ->(_) { raise Timeout::Error.new("Timeout Ignore Me") } }
65
69
 
70
+ it { should eq(-1) }
66
71
  end
67
72
  end
68
73
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: evrone-ci-worker
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0.pre20
4
+ version: 0.2.0.pre21
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Galinsky
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-11-19 00:00:00.000000000 Z
11
+ date: 2013-11-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: evrone-ci-common
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.2.0.pre20
19
+ version: 0.2.0.pre21
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.2.0.pre20
26
+ version: 0.2.0.pre21
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: evrone-ci-message
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 0.2.0.pre20
33
+ version: 0.2.0.pre21
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 0.2.0.pre20
40
+ version: 0.2.0.pre21
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: evrone-common-amqp
43
43
  requirement: !ruby/object:Gem::Requirement