summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2018-02-08 10:11:04 -0600
committerRobert Speicher <rspeicher@gmail.com>2018-02-14 10:10:03 -0600
commit8bf5203bdc9d5953d73473809b65ba4166dc9913 (patch)
treecb0c1aece3fd593c97bc8c998d6461d919e645f5 /qa
parentd6fd2f5b0f8e54ea36118d5cf6a6abce9d623188 (diff)
downloadgitlab-ce-8bf5203bdc9d5953d73473809b65ba4166dc9913.tar.gz
Suppress git output when running QA as a non-default user
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/git/repository.rb14
1 files changed, 12 insertions, 2 deletions
diff --git a/qa/qa/git/repository.rb b/qa/qa/git/repository.rb
index 8eb7031f609..4c4ef3ef477 100644
--- a/qa/qa/git/repository.rb
+++ b/qa/qa/git/repository.rb
@@ -33,7 +33,7 @@ module QA
end
def clone(opts = '')
- `git clone #{opts} #{@uri.to_s} ./`
+ `git clone #{opts} #{@uri.to_s} ./ #{suppress_output}`
end
def shallow_clone
@@ -61,12 +61,22 @@ module QA
end
def push_changes(branch = 'master')
- `git push #{@uri.to_s} #{branch}`
+ `git push #{@uri.to_s} #{branch} #{suppress_output}`
end
def commits
`git log --oneline`.split("\n")
end
+
+ private
+
+ def suppress_output
+ # If we're running as the default user, it's probably a temporary
+ # instance and output can be useful for debugging
+ return if @username == Runtime::User.default_name
+
+ "&> #{File::NULL}"
+ end
end
end
end