Permalink
Browse files

Merge branch 'wip-fix-ci' of https://github.com/pivotal/lobot into wi…

…p-fix-ci
  • Loading branch information...
2 parents 5bc40e8 + c0b567f commit 152e8795ab68267982f08f1999770e064898d495 Brian Cunnie & Matthew Kocher committed Aug 15, 2012
Showing with 4 additions and 2 deletions.
  1. +1 −1 features/step_definitions/ci_steps.rb
  2. +3 −1 lib/lobot/tasks/ci.rake
@@ -122,7 +122,7 @@
end
Then /^CI is green$/ do
- Timeout::timeout(300) do
+ Timeout::timeout(600) do
until system("cd testapp && bundle exec rake ci:status")
sleep 5
end
View
@@ -195,7 +195,9 @@ namespace :ci do
aws_conf_location = File.join(Dir.pwd, 'config', 'ci.yml')
ci_conf = YAML.load_file(aws_conf_location)
- jenkins_rss_feed = `curl -s --user #{ci_conf['basic_auth'][0]['username']}:#{ci_conf['basic_auth'][0]['password']} --anyauth --insecure https://#{ci_conf['server']['elastic_ip']}/rssAll`
+ jenkins_rss_feed = `curl --user #{ci_conf['basic_auth'][0]['username']}:#{ci_conf['basic_auth'][0]['password']} --anyauth --insecure https://#{ci_conf['server']['elastic_ip']}/rssAll`
+ # jenkins_rss_feed = `curl -s --user #{ci_conf['basic_auth'][0]['username']}:#{ci_conf['basic_auth'][0]['password']} --anyauth --insecure https://#{ci_conf['server']['elastic_ip']}/rssAll`
+ p jenkins_rss_feed
if latest_build = Nokogiri::XML.parse(jenkins_rss_feed.downcase).css('feed entry:first').first
title = latest_build.css("title").first.content
else

0 comments on commit 152e879

Please sign in to comment.