summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-04-28 18:26:58 +0000
committerHolger Levsen <holger@layer-acht.org>2016-04-28 21:52:10 +0200
commita438c3b53bd6ed8b6016ad2b565291702ee0ce64 (patch)
tree31da191ed106928aef48090164c5f06d4f09279d
parent695fcfcecf98975765ea375f2e4a9f91a40c357a (diff)
downloadjenkins.debian.net-a438c3b53bd6ed8b6016ad2b565291702ee0ce64.tar.xz
drop Tails' git-based results dir
-rw-r--r--features/support/config.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/features/support/config.rb b/features/support/config.rb
index 607969ab..d619a379 100644
--- a/features/support/config.rb
+++ b/features/support/config.rb
@@ -59,15 +59,7 @@ TAILS_ISO = ENV['ISO']
OLD_TAILS_ISO = ENV['OLD_ISO'] || TAILS_ISO
TIME_AT_START = Time.now
loop do
- ARTIFACTS_DIR = $config['TMPDIR'] + "/run-" +
- sanitize_filename(TIME_AT_START.to_s) + "-" +
- [
- "git",
- sanitize_filename(describe_git_head,
- :replacement => '-'),
- current_short_commit
- ].reject(&:empty?).join("_") + "-" +
- random_alnum_string(6)
+ ARTIFACTS_DIR = $config['TMPDIR'] + "/results"
if not(File.exist?(ARTIFACTS_DIR))
FileUtils.mkdir_p(ARTIFACTS_DIR)
break