From f4030dc35182223f6254343f05d2c8196c702a77 Mon Sep 17 00:00:00 2001
From: "Balasankar \"Balu\" C" <balasankar@gitlab.com>
Date: Thu, 14 Dec 2017 18:00:45 +0530
Subject: Improve language

---
 scripts/trigger-build-omnibus | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'scripts/trigger-build-omnibus')

diff --git a/scripts/trigger-build-omnibus b/scripts/trigger-build-omnibus
index 98d03780a0c..44102245d73 100755
--- a/scripts/trigger-build-omnibus
+++ b/scripts/trigger-build-omnibus
@@ -67,8 +67,7 @@ module Omnibus
     def wait!
       loop do
         if timeout?
-          puts "\nWaited for #{((Time.now.to_i - @start)/60)} minutes"
-          raise 'Pipeline timeout!'
+          raise "Pipeline timed out after waiting for #{duration} minutes!"
         end
 
         case status
@@ -76,8 +75,7 @@ module Omnibus
           print "."
           sleep INTERVAL
         when :success
-          puts "\nWaited for #{((Time.now.to_i - @start)/60)} minutes"
-          puts "Omnibus pipeline succeeded!"
+          puts "Omnibus pipeline succeeded in #{duration} minutes!"
           break
         else
           raise "Omnibus pipeline did not succeed!"
@@ -91,6 +89,10 @@ module Omnibus
       Time.now.to_i > (@start + MAX_DURATION)
     end
 
+    def duration
+      (Time.now.to_i - @start)/60
+    end
+
     def status
       req = Net::HTTP::Get.new(@uri)
       req['PRIVATE-TOKEN'] = ENV['GITLAB_QA_ACCESS_TOKEN']
-- 
cgit v1.2.1