summaryrefslogtreecommitdiffstats
path: root/cucumber
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-05-26 21:33:33 +0200
committerPhilip Hands <phil@hands.com>2016-05-26 21:39:53 +0200
commit0776a601268176364a575bb16fe42d9dacb5418b (patch)
tree27ecc9a329c8e9d28e086bb8e05f2d6a624fea26 /cucumber
parente6229a0a9495e9bf56fad1cc00a9cb1f2306ed88 (diff)
downloadjenkins.debian.net-0776a601268176364a575bb16fe42d9dacb5418b.tar.xz
lvc: start towards running jobs in parallel
Diffstat (limited to 'cucumber')
-rw-r--r--cucumber/features/domains/default.xml2
-rw-r--r--cucumber/features/support/config.rb4
2 files changed, 6 insertions, 0 deletions
diff --git a/cucumber/features/domains/default.xml b/cucumber/features/domains/default.xml
index f1004dcf..6a6eb14c 100644
--- a/cucumber/features/domains/default.xml
+++ b/cucumber/features/domains/default.xml
@@ -37,10 +37,12 @@
<model type='virtio'/>
<link state='up'/>
</interface>
+<!-- FIXME need to uniquify the port, based on EXECUTOR_NUMBER
<serial type='tcp'>
<source mode="bind" host='127.0.0.1' service='1337'/>
<target port='0'/>
</serial>
+-->
<input type='tablet' bus='usb'/>
<channel type='spicevmc'>
<target type='virtio' name='com.redhat.spice.0'/>
diff --git a/cucumber/features/support/config.rb b/cucumber/features/support/config.rb
index 0e5ed31f..fd9fbfe2 100644
--- a/cucumber/features/support/config.rb
+++ b/cucumber/features/support/config.rb
@@ -23,6 +23,7 @@ $pause_on_fail = !ENV['PAUSE_ON_FAIL'].nil?
$time_at_start = Time.now
$live_user = "user"
$sikuli_retry_findfailed = !ENV['SIKULI_RETRY_FINDFAILED'].nil?
+$executor_number = ENV['EXECUTOR_NUMBER']
assert File.exists?(DEFAULTS_CONFIG_FILE)
$config = YAML.load(File.read(DEFAULTS_CONFIG_FILE))
@@ -60,10 +61,13 @@ OLD_TAILS_ISO = ENV['OLD_ISO'] || TAILS_ISO
TIME_AT_START = Time.now
ARTIFACTS_DIR = $config['TMPDIR'] + "/results"
JOB_NAME = ENV['JOB_NAME']
+BUILD_ID = ENV['BUILD_ID']
PATIENCE = ENV['PATIENCE'] || 3
# Constants that are statically initialized.
CONFIGURED_KEYSERVER_HOSTNAME = 'hkps.pool.sks-keyservers.net'
+#LIBVIRT_DOMAIN_NAME = "lvcVM-" + $executor_number
+#LIBVIRT_DOMAIN_UUID = "203552d5-819c-41f3-800e-2c8ef2546" + "%03d" % $executor_number
LIBVIRT_DOMAIN_NAME = "DebianToaster"
LIBVIRT_DOMAIN_UUID = "203552d5-819c-41f3-800e-2c8ef2545404"
LIBVIRT_NETWORK_NAME = "DebianToasterNet"