[SCM] ci-tooling packaging branch, master, updated. 39985e1a3a4812ec26f07c58c4417fcc1f91da42

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=387395d

The following commit has been merged in the master branch:
commit 387395df6e711bbd5d9115153edf3a6081c179b4
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Feb 25 11:44:57 2015 +0100

    stop using install_and_require hack
    
    lxcs now should have all gems installed through new tooling deployment
    via bundler
---
 kci/daily-qa.rb | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/kci/daily-qa.rb b/kci/daily-qa.rb
index df57cae..e196734 100755
--- a/kci/daily-qa.rb
+++ b/kci/daily-qa.rb
@@ -3,14 +3,11 @@
 ENV['PATH'] = '/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin'
 Dir.chdir('/tmp/') # Containers by default have a bugged out pwd, force /tmp.
 
-require_relative "lib/install_and_require"
+require 'logger'
+require 'logger/colors'
 
-install_and_require "logger"
-install_and_require "thwait"
-install_and_require "logger/colors"
-
-require_relative "lib/jenkins"
-require_relative "lib/lp"
+require_relative 'lib/jenkins'
+require_relative 'lib/lp'
 require_relative 'lib/retry'
 require_relative 'lib/thread_pool'
 

-- 
ci-tooling packaging