summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBalasankar "Balu" C <balasankar@gitlab.com>2017-12-14 18:00:45 +0530
committerBalasankar "Balu" C <balasankar@gitlab.com>2017-12-15 11:29:52 +0530
commitf4030dc35182223f6254343f05d2c8196c702a77 (patch)
tree78a335137e11441fe52e7732559abf22d1ca625d /scripts
parentab78b570f49f6b1dd14a14803f41e7447c936946 (diff)
downloadgitlab-ce-f4030dc35182223f6254343f05d2c8196c702a77.tar.gz
Improve language
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/trigger-build-omnibus10
1 files changed, 6 insertions, 4 deletions
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']