evrone-ci-worker 0.2.0.pre6 → 0.2.0.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 936dd2f15a8805413c5d7196e7938143f679d72d
-  data.tar.gz: 5768e2127ecdd746f7711458cb3d3c6ca216390c
+  metadata.gz: ba149d203da6b56c937f41a88383bb540a8b3ed9
+  data.tar.gz: c2bf30caa9440aea2bac789e394a66f6d7bb242b
 SHA512:
-  metadata.gz: 4cc36f04fe8731092f25741647ebe3564eb1f822f94c6f6e21b11882b3e4e80661e706d443ccb7a5ca8601e126394c61ace6e79739f6a45f96e7f903290c829d
-  data.tar.gz: 2931e17494ea2195ca6e9f54c9e38238529ced0ac15526718bc4a63b1fed29e078980ce1c3da1368122e608ea5220205866f91761b03a344e0b230164c7908ff
+  metadata.gz: 82023a7a3429c6014f128af9e2bdf3978bf752a315f013bf3ba20ed52bc9df7bb1bf2bd08c4a3e06ca4688c12908a2c7c088d3d33bf3a122141a60905ba9e4db
+  data.tar.gz: d31bfbfc8bbcaa00399433df688aef5380683ca88bdbf9f41c81fa216ee65bd34be8efa364846be9fa9aa3aaacf885eaa1aaee6c120bd069e0846b471fe48d7e

data/docker/Dockerfile

@@ -13,5 +13,3 @@ ADD ./sv-enable /usr/local/bin/sv-enable
 # run bootstrap
 ADD ./bootstrap.sh /tmp/bootstrap.sh
 RUN /tmp/bootstrap.sh && rm /tmp/bootstrap.sh
-
-ENTRYPOINT ["/usr/bin/runsvdir", "-P", "/etc/service"]

data/docker/bootstrap.sh

@@ -48,6 +48,10 @@ apt-get install -qy openssh-server
 mkdir -p /var/run/sshd
 sv-gen ssh "/usr/sbin/sshd -D -e"
 
+# install syslog
+apt-get install -qy rsyslog
+sv-gen rsyslogd "/usr/sbin/rsyslogd -c5 -n" root
+
 # install postgresql
 apt-get install -qy postgresql-9.1 postgresql-contrib-9.1
 echo "local all all     trust" > /etc/postgresql/9.1/main/pg_hba.conf
@@ -83,10 +87,12 @@ ln -sf /usr/local/$(basename $PH_PKG .tar.bz2)/bin/phantomjs /usr/local/bin
 
 # add ruby
 apt-get install -qy rbenv rbenv-2.0.0-p195 rbenv-1.9.3-p448 rbenv-2.0.0-p247 rbenv-1.9.3-p392
+apt-get install -qy ruby1.8 ruby1.8-dev rubygems # 1.8.7
 env RBENV_VERSION=2.0.0-p247 rbenv exec gem install bundler --no-ri --no-rdoc
 env RBENV_VERSION=2.0.0-p195 rbenv exec gem install bundler --no-ri --no-rdoc
 env RBENV_VERSION=1.9.3-p448 rbenv exec gem install bundler --no-ri --no-rdoc
 env RBENV_VERSION=1.9.3-p392 rbenv exec gem install bundler --no-ri --no-rdoc
+env RBENV_VERSION=system rbenv exec gem install bundler --no-ri --no-rdoc
 rbenv rehash
 
 apt-get -qy clean autoremove
@@ -95,3 +101,4 @@ sv-enable postgresql
 sv-enable ssh
 sv-enable mysql
 sv-enable redis-server
+sv-enable rsyslogd

data/evrone-ci-worker.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'evrone-ci-common',   "= #{Evrone::CI::Worker::VERSION}"
   spec.add_runtime_dependency 'evrone-ci-message',  "= #{Evrone::CI::Worker::VERSION}"
-  spec.add_runtime_dependency 'evrone-common-amqp', '~> 0.1.1'
+  spec.add_runtime_dependency 'evrone-common-amqp', '~> 0.2.4'
   spec.add_runtime_dependency 'docker-api',         '= 1.5.4'
   spec.add_runtime_dependency 'hashr',              '= 0.0.22'
 

data/lib/evrone/ci/worker/cli.rb

@@ -1,5 +1,6 @@
 require 'optparse'
 require 'evrone/common/amqp'
+require 'evrone/ci/common/env_file'
 
 module Evrone
   module CI
@@ -8,6 +9,7 @@ module Evrone
 
         include Helper::Config
         include Helper::Logger
+        include Common::EnvFile
 
         def initialize
           @options = {}
@@ -16,8 +18,6 @@ module Evrone
         end
 
         def run
-          logger.warn "spawn inside #{config.path_prefix}"
-
           trap('INT') {
             Thread.new do
               Evrone::Common::AMQP.shutdown
@@ -40,27 +40,17 @@ module Evrone
               opts.on("-p", "--path PATH", "Working directory, default current directory") do |v|
                 @options[:path_prefix] = v.to_s
               end
-              opts.on("-c", "--config FILE", "Path to configuration file") do |v|
-                read_configuration v
+              opts.on("-c", "--config FILE", "Path to configuration file, default /etc/evrone/ci") do |v|
+                @options[:config] = v
               end
             end.parse!
 
+            read_env_file @options.delete(:config)
+
             @options.each_pair do |k,v|
               config.public_send("#{k}=", v)
             end
           end
-
-          def read_configuration(file)
-            file = File.expand_path(file)
-            buf  = File.read(file)
-
-            buf.split("\n").each do |line|
-              puts line
-              env, value = line.split("=").map(&:strip)
-              ENV[env] = value
-            end
-          end
-
       end
     end
   end

data/lib/evrone/ci/worker/configuration.rb

@@ -26,7 +26,7 @@ module Evrone
 
                docker: {
                  remote_dir: "/home/ci",
-                 init:       %w{ /usr/local/bin/runsvdir -P /etc/service },
+                 init:       %w{ /usr/bin/runsvdir -P /etc/service },
                  image:      "ci",
 
                  ssh: {

data/lib/evrone/ci/worker/consumers/jobs_consumer.rb

@@ -8,17 +8,19 @@ module Evrone
         include Evrone::Common::AMQP::Consumer
 
         exchange 'ci.jobs'
-        queue    'ci.worker.jobs.generic'
+        queue    'ci.worker.jobs'
         ack      true
 
         model Message::PerformJob
 
         def perform(message)
-          job         = Job.new message
-          number      = Thread.current[:consumer_id] || 0
-          path_prefix = "/tmp/.test/job.#{number}"
-          Worker.perform(job, path_prefix)
-          ack!
+          Worker.logger.tagged self.class.consumer_id do
+            job         = Job.new message
+            number      = Thread.current[:consumer_id] || 0
+            path_prefix = "/tmp/.test/job.#{number}"
+            Worker.perform(job, path_prefix)
+            ack!
+          end
         end
 
       end

data/lib/evrone/ci/worker/initializers/amqp.rb

@@ -1,54 +1,3 @@
-require 'evrone/common/amqp'
+require 'evrone/ci/common/amqp'
 
-module Evrone::CI::Worker::AMQP
-
-  Base = Struct.new("Subscribing", :app) do
-    include Evrone::CI::Worker::Helper::Logger
-
-    def consumer_name
-      Thread.current[:consumer_name]
-    end
-
-    def consumer_id
-      Thread.current[:consumer_id]
-    end
-
-    def consumer_tag
-      consumer_id ? "#{consumer_name.split('::').last} #{consumer_id}" : consumer_name
-    end
-  end
-
-  class Subscribing < Base
-    def call(env)
-      logger.tagged(consumer_tag) do
-        logger.warn "subsribing #{env[:exchange].name}"
-        rs = app.call env
-        logger.warn "shutdown"
-        rs
-      end
-    end
-  end
-
-  class Recieving < Base
-    def call(env)
-      logger.warn "payload recieved #{env[:payload].inspect[0...60]}..."
-      rs = app.call env
-      logger.warn "commit message"
-      rs
-    end
-  end
-end
-
-Evrone::Common::AMQP.configure do |c|
-  c.subscribing do
-    use Evrone::CI::Worker::AMQP::Subscribing
-  end
-
-  c.recieving do
-    use Evrone::CI::Worker::AMQP::Recieving
-  end
-
-  c.content_type = 'application/x-protobuf'
-  c.logger = nil
-  c.url    = Evrone::CI::Worker.config.amqp_url
-end
+Evrone::CI::Common::AMQP.setup(Evrone::CI::Worker.logger, url: Evrone::CI::Worker.config.amqp_url)

data/lib/evrone/ci/worker/middlewares/docker_start_container.rb

@@ -39,7 +39,7 @@ module Evrone
             open_ssh(host, "ci", ssh_options) do |ssh|
               begin
                 env.ssh = ssh
-                logger.tagged "SSH" do
+                logger.tagged "ssh" do
                   yield
                 end
               end
@@ -57,7 +57,7 @@ module Evrone
             env.container_gateway ||= env.container.json['NetworkSettings']['Gateway']
             env.docker_repo_dir     = Pathname.new(config.docker.remote_dir).join(env.job.message.name)
 
-            logger.tagged "DOCKER #{env.container.id}" do
+            logger.tagged "docker #{env.container.id}" do
               begin
                 logger.info "start container"
                 sleep 3

data/lib/evrone/ci/worker/middlewares/log_job.rb

@@ -7,9 +7,7 @@ module Evrone
         include Helper::Logger
 
         def call(env)
-          matrix_key = env.job.message.matrix_keys.join(" ")
-
-          logger.tagged("JOB #{env.job.message.id}.#{env.job.message.job_id} #{matrix_key}") do
+          logger.tagged("job #{env.job.message.id}.#{env.job.message.job_id}") do
             logger.info "starting job"
             rs = app.call env
             logger.info "done job"

data/lib/evrone/ci/worker/middlewares/update_job_status.rb

@@ -1,4 +1,5 @@
 require 'evrone/ci/message'
+require 'evrone/ci/common/error_notifier'
 
 module Evrone
   module CI
@@ -22,6 +23,7 @@ module Evrone
           rescue Exception => e
             env.job.add_to_output("\n\nERROR: #{e.inspect}\n")
             logger.error("ERROR: #{e.inspect}\n    BACKTRACE:\n#{e.backtrace.map{|i| "    #{i}" }.join("\n")}")
+            Common::ErrorNotifier.notify(e)
           end
 
           msg = "\nDone. Your build exited with %s.\n"

data/lib/evrone/ci/worker/version.rb

@@ -1,7 +1,7 @@
 module Evrone
   module CI
     module Worker
-      VERSION = "0.2.0.pre6"
+      VERSION = "0.2.0.pre7"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evrone-ci-worker
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre6
+  version: 0.2.0.pre7
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evrone-ci-common
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre6
+        version: 0.2.0.pre7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre6
+        version: 0.2.0.pre7
 - !ruby/object:Gem::Dependency
   name: evrone-ci-message
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre6
+        version: 0.2.0.pre7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre6
+        version: 0.2.0.pre7
 - !ruby/object:Gem::Dependency
   name: evrone-common-amqp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: ci worker