evrone-ci-worker 0.2.0.pre26 → 0.2.0.pre27

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 349c721e955e81ffb74d657b1537a10a356c3261
4
- data.tar.gz: 5e0082dca315bc2482153a6031bb82542c3387a9
3
+ metadata.gz: 1d9087b50e29982ccf2df4af64ce15f8e6e10801
4
+ data.tar.gz: 9c3c7f1304a4a5aed273e5906387a50dddbca6c0
5
5
  SHA512:
6
- metadata.gz: 0a50968a31dab4a80810682742e99f6fd49616263504fcf2dc4b6603c39ee8160c6bce90d7b190815b53bf6ffe2e322d0059881e8073fa476c7ed4d8bd7f25de
7
- data.tar.gz: d8d1718989ae3e82de23e3e0d69e5e3b2713e6713376ac4021d07c6b98e117aab6e2105c6ec2baf910d245d06156ba5eda3111a18951f46065298ad84906be9c
6
+ metadata.gz: fb491b907daf77ece535d898e6c4594b4e0865b7b7d44a53794871a75a7aa75ea1b8baf54cdd4e7bf2af8042accd47162a3acf848ad66d9125869a57a32086de
7
+ data.tar.gz: 035e7619385e2dcff48ff222a2bdf8d9c5607d27f949bb3b597d449851b690b48e8128cf5efd45ad9a4b0930b8392e250af1627097a1a358e10ff439cd2b0a83
@@ -27,7 +27,7 @@ module Evrone
27
27
  docker: {
28
28
  remote_dir: "/home/ci",
29
29
  init: %w{ /usr/bin/runsvdir -P /etc/service },
30
- image: "ci",
30
+ image: "dmexe/ci",
31
31
 
32
32
  ssh: {
33
33
  host: nil, # used in tests
@@ -52,10 +52,8 @@ module Evrone
52
52
 
53
53
  env.job.add_to_output "using #{Socket.gethostname}/#{env.container.id}\n"
54
54
 
55
- env.container_addr = config.docker.ssh.host
56
- env.container_addr ||= env.container.json['NetworkSettings']['IPAddress']
57
- env.container_gateway ||= env.container.json['NetworkSettings']['Gateway']
58
- env.docker_repo_dir = Pathname.new(config.docker.remote_dir).join(env.job.message.name)
55
+ env.container_addr = env.container.json['NetworkSettings']['IPAddress']
56
+ env.docker_repo_dir = Pathname.new(config.docker.remote_dir).join(env.job.message.name)
59
57
 
60
58
  logger.tagged "docker #{env.container.id}" do
61
59
  begin
@@ -73,6 +71,7 @@ module Evrone
73
71
  {
74
72
  'Cmd' => config.docker.init,
75
73
  'Image' => config.docker.image,
74
+ 'Memory' => 1610612736, # 1.5g
76
75
  }.merge(config.docker.create_options || {})
77
76
  end
78
77
 
@@ -1,7 +1,7 @@
1
1
  module Evrone
2
2
  module CI
3
3
  module Worker
4
- VERSION = "0.2.0.pre26"
4
+ VERSION = "0.2.0.pre27"
5
5
  end
6
6
  end
7
7
  end
@@ -16,7 +16,7 @@ describe Evrone::CI::Worker::Configuration do
16
16
  its(:ssh) { should be }
17
17
  its(:remote_dir) { should eq '/home/ci' }
18
18
  its(:init) { should be }
19
- its(:image) { should eq 'ci' }
19
+ its(:image) { should eq 'dmexe/ci' }
20
20
  end
21
21
 
22
22
  context "docker.ssh" do
@@ -14,13 +14,5 @@ RSpec.configure do |config|
14
14
  config.before(:each) do
15
15
  Evrone::Common::AMQP::Testing.clear
16
16
  Evrone::CI::Worker.reset_config!
17
-
18
- Evrone::CI::Worker.configure do |c|
19
- c.docker.ssh.port = 2223
20
- c.docker.ssh.host = 'localhost'
21
- c.docker.create_options = {
22
- 'PortSpecs' => ['2022:22']
23
- }
24
- end
25
17
  end
26
18
  end
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.pre26
4
+ version: 0.2.0.pre27
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-12-02 00:00:00.000000000 Z
11
+ date: 2013-12-03 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.pre26
19
+ version: 0.2.0.pre27
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.pre26
26
+ version: 0.2.0.pre27
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.pre26
33
+ version: 0.2.0.pre27
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.pre26
40
+ version: 0.2.0.pre27
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: evrone-common-amqp
43
43
  requirement: !ruby/object:Gem::Requirement