summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-11-27 12:18:03 +0100
committerPhilip Hands <phil@hands.com>2016-11-27 17:16:19 +0100
commit4a0d8da48ca045b7d975d66bcfb2a3bdb51e613d (patch)
treed67a7a78446281dd9a1c40b309b6b78da68241fb
parent41582e67c756750755d28841eb16976bb7f96432 (diff)
downloadjenkins.debian.net-4a0d8da48ca045b7d975d66bcfb2a3bdb51e613d.tar.xz
lvc: Edu: Combi takes too long, so do Main Server for now
-rw-r--r--cucumber/features/install.feature2
-rw-r--r--cucumber/features/step_definitions/common_steps.rb16
2 files changed, 17 insertions, 1 deletions
diff --git a/cucumber/features/install.feature b/cucumber/features/install.feature
index 43b1d491..cea2a63c 100644
--- a/cucumber/features/install.feature
+++ b/cucumber/features/install.feature
@@ -91,7 +91,7 @@ Feature: Doing variations on d-i installs
And I start the computer
And I select the install mode
And I select British English
- And I select Combi Debian-Edu profile
+ And I select Main Server Debian-Edu profile
And I use the Debian-Edu Automatic Partitioning
And I ignore Popcon
And I set the root password to "rootme"
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index 27bdd292..16caf653 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -470,6 +470,22 @@ Given /^I select Combi Debian-Edu profile$/ do
@screen.type(Sikuli::Key.ENTER)
end
+Given /^I select Main Server Debian-Edu profile$/ do
+ @screen.wait(diui_png("Edu-Profile"), 2 * 60 * PATIENCE)
+ @screen.type(Sikuli::Key.DOWN)
+ @screen.type(Sikuli::Key.SPACE)
+ @screen.type(Sikuli::Key.DOWN)
+ @screen.type(Sikuli::Key.DOWN)
+ @screen.type(Sikuli::Key.SPACE)
+
+ if "gui" == @ui_mode
+ @screen.wait(diui_png("CONTINUEunselected"), 10 * PATIENCE)
+ @screen.type(Sikuli::Key.TAB)
+ @screen.wait(diui_png("CONTINUEselected"), 10 * PATIENCE)
+ end
+ @screen.type(Sikuli::Key.ENTER)
+end
+
Given /^I select Standalone Debian-Edu profile$/ do
@screen.wait(diui_png("Edu-Profile"), 2 * 60 * PATIENCE)
@screen.type(Sikuli::Key.SPACE)