From 88d376c9b7d2e52dee57fc67b2cbd07422a4e5bd Mon Sep 17 00:00:00 2001
From: Philip Hands <phil@hands.com>
Date: Wed, 11 May 2016 17:22:32 +0200
Subject: combined diff with most of the cucmber changes, plus update_jdn stuff

---
 cucumber/features/support/config.rb | 18 ++++++------------
 cucumber/features/support/env.rb    |  2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'cucumber/features/support')

diff --git a/cucumber/features/support/config.rb b/cucumber/features/support/config.rb
index 25c107b4..60432246 100644
--- a/cucumber/features/support/config.rb
+++ b/cucumber/features/support/config.rb
@@ -1,11 +1,11 @@
 require 'fileutils'
 require 'yaml'
-require "features/support/helpers/misc_helpers.rb"
+require "cucumber/features/support/helpers/misc_helpers.rb"
 
 # These files deal with options like some of the settings passed
 # to the `run_test_suite` script, and "secrets" like credentials
 # (passwords, SSH keys) to be used in tests.
-CONFIG_DIR = "/srv/jenkins/features/config"
+CONFIG_DIR = "/srv/jenkins/cucumber/features/config"
 DEFAULTS_CONFIG_FILE = "#{CONFIG_DIR}/defaults.yml"
 LOCAL_CONFIG_FILE = "#{CONFIG_DIR}/local.yml"
 LOCAL_CONFIG_DIRS_FILES_GLOB = "#{CONFIG_DIR}/*.d/*.yml"
@@ -15,7 +15,7 @@ $tails_iso = ENV['ISO'] || get_newest_iso
 $old_tails_iso = ENV['OLD_ISO'] || get_oldest_iso
 $tmp_dir = ENV['PWD']
 $vm_xml_path = ENV['VM_XML_PATH']
-$misc_files_dir = "features/misc_files"
+$misc_files_dir = "cucumber/features/misc_files"
 $keep_snapshots = !ENV['KEEP_SNAPSHOTS'].nil?
 $x_display = ENV['DISPLAY']
 $debug = !ENV['DEBUG'].nil?
@@ -58,13 +58,7 @@ LIVE_USER = "live_user"
 TAILS_ISO = ENV['ISO']
 OLD_TAILS_ISO = ENV['OLD_ISO'] || TAILS_ISO
 TIME_AT_START = Time.now
-loop do
-  ARTIFACTS_DIR = $config['TMPDIR'] + "/results"
-  if not(File.exist?(ARTIFACTS_DIR))
-    FileUtils.mkdir_p(ARTIFACTS_DIR)
-    break
-  end
-end
+ARTIFACTS_DIR = $config['TMPDIR'] + "/results"
 
 # Constants that are statically initialized.
 CONFIGURED_KEYSERVER_HOSTNAME = 'hkps.pool.sks-keyservers.net'
@@ -72,7 +66,7 @@ LIBVIRT_DOMAIN_NAME = "DebianToaster"
 LIBVIRT_DOMAIN_UUID = "203552d5-819c-41f3-800e-2c8ef2545404"
 LIBVIRT_NETWORK_NAME = "DebianToasterNet"
 LIBVIRT_NETWORK_UUID = "f2305af3-2a64-4f16-afe6-b9dbf02a597e"
-MISC_FILES_DIR = "/srv/jenkins/features/misc_files"
+MISC_FILES_DIR = "/srv/jenkins/cucumber/features/misc_files"
 SERVICES_EXPECTED_ON_ALL_IFACES =
   [
    ["cupsd",    "0.0.0.0", "631"],
@@ -94,7 +88,7 @@ TOR_AUTHORITIES =
    "171.25.193.9",
    "154.35.175.225",
   ]
-VM_XML_PATH = "/srv/jenkins/features/domains"
+VM_XML_PATH = "/srv/jenkins/cucumber/features/domains"
 
 #TAILS_SIGNING_KEY = cmd_helper(". #{Dir.pwd}/config/amnesia; echo ${AMNESIA_DEV_KEYID}").tr(' ', '').chomp
 TAILS_DEBIAN_REPO_KEY = "221F9A3C6FA3E09E182E060BC7988EA7A358D82E"
diff --git a/cucumber/features/support/env.rb b/cucumber/features/support/env.rb
index 2e17ae76..53f502e1 100644
--- a/cucumber/features/support/env.rb
+++ b/cucumber/features/support/env.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require "features/support/extra_hooks.rb"
+require "cucumber/features/support/extra_hooks.rb"
 require 'time'
 require 'rspec'
 
-- 
cgit v1.2.3-70-g09d2