combined diff with most of the cucmber changes, plus update_jdn stuff

2 files changed, 258 insertions, 225 deletions

diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index bd03cebb..69fd238f 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -91,7 +91,9 @@ def robust_notification_wait(notification_image, time_to_wait)
 end
 
 def post_snapshot_restore_hook
-  $vm.wait_until_remote_shell_is_up
+  # FIXME -- we've got a brain-damaged version of this, unlike Tails, so it breaks after restores at present
+  # that being the case, let's not worry until we actually miss the feature
+  #$vm.wait_until_remote_shell_is_up
   post_vm_start_hook
 
   # XXX-9p: See XXX-9p above
@@ -122,6 +124,10 @@ def post_snapshot_restore_hook
   #end
 end
 
+def diui_png(name,ui_mode)
+  return "d-i_" + ui_mode + "_" + name + ".png"
+end
+
 Given /^a computer$/ do
   $vm.destroy_and_undefine if $vm
   $vm = VM.new($virt, VM_XML_PATH, $vmnet, $vmstorage, DISPLAY)
@@ -257,136 +263,243 @@ When /^I destroy the computer$/ do
   $vm.destroy_and_undefine
 end
 
-Given /^the computer (re)?boots DebianInstaller(|\d+)$/ do |reboot,version|
+Given /^I boot the computer, and select ([a-z]*) mode$/ do |ui_mode|
 
   boot_timeout = 30
-  # We need some extra time for memory wiping if rebooting
 
   @screen.wait("d-i8_bootsplash.png", boot_timeout)
-  @screen.type(Sikuli::Key.TAB)
 
-  @screen.type(' preseed/early_command="echo ttyS0::askfirst:-/bin/sh>>/etc/inittab;kill -HUP 1"' + " blacklist=psmouse #{@boot_options}" +
+  if "gui" == ui_mode
+    @screen.type(Sikuli::Key.DOWN) 
+    @screen.wait("d-i_bootmenu_graphical.png", 10)
+  end
+
+  @screen.type(Sikuli::Key.TAB)
+  @screen.type(' preseed/early_command="echo DPMS=-s\\\\ 0 > /lib/debian-installer.d/S61Xnoblank ; echo ttyS0::askfirst:-/bin/sh>>/etc/inittab;kill -HUP 1"' + " blacklist=psmouse #{@boot_options}" +
                Sikuli::Key.ENTER)
   $vm.wait_until_remote_shell_is_up
 end
 
-Given /^I select British English$/ do
-  @screen.wait("DebianInstallerSelectLangEnglish.png", 30)
+Given /^in ([a-z]*) mode I select British English$/ do |ui_mode|
+  @screen.wait(diui_png("English",ui_mode), 30)
   @screen.type(Sikuli::Key.ENTER)
-  @screen.wait("DebianInstallerCountrySelection.png", 10)
+  @screen.wait(diui_png("SelectYourLocation",ui_mode), 10)
   @screen.type(Sikuli::Key.UP)
-  @screen.waitVanish("DebianInstallerCountrySelection.png", 10)
+  @screen.wait(diui_png("UnitedKingdom",ui_mode), 10)
   @screen.type(Sikuli::Key.ENTER)
-  @screen.wait("DebianInstallerSelectLangEnglishUK.png", 10)
+  @screen.wait(diui_png("BritishEnglish",ui_mode), 10)
   @screen.type(Sikuli::Key.ENTER)
 end
 
-Given /^I accept the hostname, using "([^"]*)" as the domain$/ do |domain|
-  @screen.wait("DebianInstallerHostnamePrompt.png", 5*60)
+Given /^in ([a-z]*) mode I accept the hostname, using "([^"]*)" as the domain$/ do |ui_mode,domain|
+  @screen.wait(diui_png("EnterTheHostname",ui_mode), 5*60)
   @screen.type(Sikuli::Key.ENTER)
-  @screen.wait("DebianInstallerDomainPrompt.png", 10)
+  @screen.wait(diui_png("DomainName",ui_mode), 10)
   @screen.type(domain + Sikuli::Key.ENTER)
-  @screen.waitVanish("DebianInstallerDomainPrompt.png", 10)
+  @screen.waitVanish(diui_png("DomainName",ui_mode), 10)
 end
 
-Given /^I set the root password to "([^"]*)"$/ do |rootpw|
+Given /^in ([a-z]*) mode I set the root password to "([^"]*)"$/ do |ui_mode, rootpw|
 # Root Password, twice
-  @screen.wait("DebianInstallerRootPassword.png", 30)
-  @screen.type(rootpw + Sikuli::Key.ENTER)
-  @screen.waitVanish("DebianInstallerRootPassword.png", 10)
+  @screen.wait(diui_png("RootPassword",ui_mode), 30)
+  @screen.type(rootpw)
+  if "gui" == ui_mode
+    @screen.type(Sikuli::Key.TAB)
+  else
+    @screen.type(Sikuli::Key.ENTER)
+    @screen.waitVanish(diui_png("RootPassword",ui_mode), 10)
+  end
   @screen.type(rootpw + Sikuli::Key.ENTER)
 end
 
-Given /^I set the password for "([^"]*)" to be "([^"]*)"$/ do |fullname,password|
+Given /^in ([a-z]*) mode I set the password for "([^"]*)" to be "([^"]*)"$/ do |ui_mode,fullname,password|
 # Username, and password twice
-  @screen.wait("DebianInstallerNameOfUser.png", 10)
+  @screen.wait(diui_png("NameOfUser",ui_mode), 10)
   @screen.type(fullname + Sikuli::Key.ENTER)
-  @screen.waitVanish("DebianInstallerNameOfUser.png", 10)
+  @screen.waitVanish(diui_png("NameOfUser",ui_mode), 10)
   @screen.type(Sikuli::Key.ENTER)
-  @screen.wait("DebianInstallerUserPassword.png", 10)
-  @screen.type(password + Sikuli::Key.ENTER)
-  @screen.waitVanish("DebianInstallerUserPassword.png", 10)
+  @screen.wait(diui_png("UserPassword",ui_mode), 10)
+  @screen.type(password)
+  if "gui" == ui_mode
+    @screen.type(Sikuli::Key.TAB)
+  else
+    @screen.type(Sikuli::Key.ENTER)
+    @screen.waitVanish(diui_png("UserPassword",ui_mode), 10)
+  end
   @screen.type(password + Sikuli::Key.ENTER)
 end
 
-  #@screen.wait("DebianInstallerNoDiskFound.png", 60)
+  #@screen.wait(diui_png("NoDiskFound",ui_mode), 60)
 
-Given /^I select full-disk, single-filesystem partitioning$/ do
-  @screen.wait("DebianInstallerPartitioningMethod.png", 60)
+Given /^in ([a-z]*) mode I select full-disk, single-filesystem partitioning$/ do |ui_mode|
+  @screen.wait(diui_png("PartitioningMethod",ui_mode), 60)
+  sleep(10)
+  @screen.wait(diui_png("PartitioningMethod",ui_mode), 10)
   @screen.type(Sikuli::Key.ENTER)
-  @screen.wait("DebianInstallerSelectDiskToPartition.png", 10)
+  @screen.wait(diui_png("SelectDiskToPartition",ui_mode), 10)
   @screen.type(Sikuli::Key.ENTER)
-  @screen.wait("DebianInstallerPartitioningScheme.png", 10)
+  @screen.wait(diui_png("PartitioningScheme",ui_mode), 10)
   @screen.type(Sikuli::Key.ENTER)
-  @screen.wait("d-i_FinishPartitioning.png", 10)
+  @screen.wait(diui_png("FinishPartitioning",ui_mode), 10)
   sleep(5) # FIXME -- why do we need this?  It's weird that the wait is not enough
   @screen.type(Sikuli::Key.ENTER)
   # prompt about Writing Partitions to disk:
-  @screen.wait("d-i_No.png", 10)
-  @screen.type(Sikuli::Key.TAB)
-  @screen.wait("d-i_Yes.png", 10)
+  @screen.wait(diui_png("No",ui_mode), 10)
+  if "gui" == ui_mode
+    @screen.type(Sikuli::Key.DOWN)
+  else
+    @screen.type(Sikuli::Key.TAB)
+  end
+  @screen.wait(diui_png("Yes",ui_mode), 10)
   @screen.type(Sikuli::Key.ENTER)
 end
 
-Given /^I note that the Base system is being installed$/ do
-  @screen.wait("DebianInstallerInstallingBaseSystem.png", 30)
-  @screen.waitVanish("DebianInstallerInstallingBaseSystem.png", 15 * 60)
+Given /^in ([a-z]*) mode I note that the Base system is being installed$/ do |ui_mode|
+  @screen.wait(diui_png("InstallingBaseSystem",ui_mode), 30)
+  @screen.waitVanish(diui_png("InstallingBaseSystem",ui_mode), 15 * 60)
 end
 
-Given /^I accept the default mirror$/ do
-  @screen.wait("DebianInstallerMirrorCountry.png", 10 * 60)
+Given /^in ([a-z]*) mode I accept the default mirror$/ do |ui_mode|
+  @screen.wait(diui_png("MirrorCountry",ui_mode), 10 * 60)
   @screen.type(Sikuli::Key.ENTER)
-  @screen.wait("d-i_ArchiveMirror.png", 5)
+  @screen.wait(diui_png("ArchiveMirror",ui_mode), 5)
   @screen.type(Sikuli::Key.ENTER)
-  @screen.wait("d-i_HttpProxy.png", 5)
+  @screen.wait(diui_png("HttpProxy",ui_mode), 5)
+  #@screen.type("http://local-http-proxy:3128/" + Sikuli::Key.ENTER)
   @screen.type(Sikuli::Key.ENTER)
 end
 
-Given /^I neglect to scan more CDs$/ do
-  @screen.wait("d-i_ScanCD.png", 15 * 60)
+Given /^in ([a-z]*) mode I neglect to scan more CDs$/ do |ui_mode|
+  @screen.wait(diui_png("ScanCD",ui_mode), 15 * 60)
   @screen.type(Sikuli::Key.ENTER)
-  @screen.wait("d-i_UseNetMirror.png", 10)
-  @screen.wait("d-i_Yes.png", 10)
-  @screen.type(Sikuli::Key.TAB)
-  @screen.wait("d-i_No.png", 10)
+  @screen.wait(diui_png("UseNetMirror",ui_mode), 10)
+  @screen.wait(diui_png("Yes",ui_mode), 10)
+  if "gui" == ui_mode
+    @screen.type(Sikuli::Key.DOWN)
+  else
+    @screen.type(Sikuli::Key.TAB)
+  end
+  @screen.wait(diui_png("No",ui_mode), 10)
   @screen.type(Sikuli::Key.ENTER)
 end
 
-Given /^I ignore Popcon$/ do
-  #@screen.wait("d-i_popcon.png", 10 * 60)
-  @screen.wait("d-i_No.png", 10 * 60)
+Given /^in ([a-z]*) mode I ignore Popcon$/ do |ui_mode|
+  @screen.wait(diui_png("popcon",ui_mode), 10 * 60)
   @screen.type(Sikuli::Key.ENTER)
+  @screen.waitVanish(diui_png("popcon",ui_mode), 10)
 end
 
-Given /^we reach the Tasksel prompt$/ do
-  @screen.wait("d-i_ChooseSoftware.png", 5 * 60)
+Given /^in ([a-z]*) mode we reach the Tasksel prompt$/ do |ui_mode|
+  @screen.wait(diui_png("ChooseSoftware",ui_mode), 5 * 60)
 end
 
-Given /^I hit ENTER$/ do
+Given /^in ([a-z]*) mode I unset the Desktop task$/ do |ui_mode|
+  @screen.wait(diui_png("DesktopTask_Yes",ui_mode), 2 * 60)
+
+  # deal with post-snapshot screen flicker  FIXME -- check if we really need this
+  sleep(5)
+  @screen.wait(diui_png("DesktopTask_Yes",ui_mode), 10)
+
+  @screen.type(Sikuli::Key.SPACE)
+  @screen.waitVanish(diui_png("DesktopTask_Yes",ui_mode), 10)
+
+  if "gui" == ui_mode
+    @screen.wait(diui_png("CONTINUEunselected",ui_mode), 10)
+    @screen.type(Sikuli::Key.TAB)
+    @screen.wait(diui_png("CONTINUEselected",ui_mode), 10)
+  end
   @screen.type(Sikuli::Key.ENTER)
 end
 
-Given /^I select the Desktop task$/ do
-  @screen.wait("d-i_ChooseSoftware.png", 10)
+Given /^in ([a-z]*) mode I unset the Desktop and Print tasks$/ do |ui_mode|
+  @screen.wait(diui_png("DesktopTask_Yes",ui_mode), 2 * 60)
+
+  # deal with post-snapshot screen flicker  FIXME -- check if we really need this
+  sleep(5)
+  @screen.wait(diui_png("DesktopTask_Yes",ui_mode), 10)
+
   @screen.type(Sikuli::Key.SPACE)
   @screen.type(Sikuli::Key.DOWN)
+  @screen.type(Sikuli::Key.DOWN)
+  @screen.type(Sikuli::Key.DOWN)
+  @screen.type(Sikuli::Key.DOWN)
+  @screen.type(Sikuli::Key.DOWN)
+  @screen.type(Sikuli::Key.DOWN)
+  @screen.type(Sikuli::Key.DOWN)
+  @screen.type(Sikuli::Key.DOWN)
   @screen.type(Sikuli::Key.SPACE)
-  @screen.wait("d-i_DesktopTask_Yes.png", 10)
+  @screen.waitVanish(diui_png("DesktopTask_Yes",ui_mode), 10)
+
+  if "gui" == ui_mode
+    @screen.wait(diui_png("CONTINUEunselected",ui_mode), 10)
+    @screen.type(Sikuli::Key.TAB)
+    @screen.wait(diui_png("CONTINUEselected",ui_mode), 10)
+  end
+  @screen.type(Sikuli::Key.ENTER)
+end
+
+Given /^in ([a-z]*) mode I select the Desktop task$/ do |ui_mode|
+  @screen.wait(diui_png("DesktopTask_Yes",ui_mode), 2 * 60)
+
+  # deal with post-snapshot screen flicker -- FIXME this needs to be fixed via looking to see if the remote login is working before we look at the screen
+  debug_log("debug: Found DesktopTask_Yes, pausing for 20s", :color => :blue)
+  sleep(20)
+
+  @screen.type(Sikuli::Key.DOWN+Sikuli::Key.SPACE)
+  @screen.wait(diui_png("Desktop+Gnome",ui_mode), 10)
+  if "gui" == ui_mode
+    @screen.wait(diui_png("CONTINUEunselected",ui_mode), 10)
+    @screen.type(Sikuli::Key.TAB)
+    @screen.wait(diui_png("CONTINUEselected",ui_mode), 10)
+  end
   @screen.type(Sikuli::Key.ENTER)
+  @screen.waitVanish(diui_png("Desktop+Gnome",ui_mode), 10)
+end
+
+Given /^in ([a-z]*) mode I wait while the bulk of the packages are installed$/ do |ui_mode|
+  @screen.wait(diui_png("InstallSoftware",ui_mode), 10)
+  @screen.waitVanish(diui_png("InstallSoftware",ui_mode), 80 * 60)
 end
 
-Given /^I install GRUB$/ do
-  @screen.wait("d-i_InstallGRUB.png", 80 * 60)
+Given /^in ([a-z]*) mode I install GRUB$/ do |ui_mode|
   #@screen.wait("Install the GRUB", 80 * 60)
+  debug_log("debug: Look for InstallingGRUBprogress", :color => :blue)
+  @screen.wait(diui_png("InstallingGRUBprogress",ui_mode), 2 * 60)
+  debug_log("debug: Found InstallingGRUBprogress", :color => :blue)
+  @screen.waitVanish(diui_png("InstallingGRUBprogress",ui_mode), 2 * 60)
+  debug_log("debug: InstallingGRUBprogress gone again", :color => :blue)
+  debug_log("debug: Look for InstallGRUB", :color => :blue)
+  @screen.wait(diui_png("InstallGRUB",ui_mode), 2 * 60)
+  debug_log("debug: Found InstallGRUB", :color => :blue)
+  sleep(10)
+  @screen.wait(diui_png("InstallGRUB",ui_mode), 10)
+  debug_log("debug: Found InstallGRUB (again)", :color => :blue)
+  if "gui" == ui_mode
+    debug_log("debug: We're in GUI mode", :color => :blue)
+    @screen.wait(diui_png("CONTINUEunselected",ui_mode), 10)
+    debug_log("debug: Found CONTINUEunselected", :color => :blue)
+    sleep(10)
+    debug_log("debug: Press UP", :color => :blue)
+    @screen.type(Sikuli::Key.UP)
+    sleep(10)
+    debug_log("debug: Press DOWN", :color => :blue)
+    @screen.type(Sikuli::Key.DOWN)
+    sleep(10)
+    debug_log("debug: Press TAB", :color => :blue)
+    @screen.type(Sikuli::Key.TAB)
+    @screen.wait(diui_png("CONTINUEselected",ui_mode), 10)
+    debug_log("debug: Found CONTINUEselected", :color => :blue)
+  end
+  debug_log("debug: Press ENTER", :color => :blue)
   @screen.type(Sikuli::Key.ENTER)
-  @screen.wait("d-i_GRUBEnterDev.png", 10 * 60)
+  @screen.wait(diui_png("GRUBEnterDev",ui_mode), 10 * 60)
   @screen.type(Sikuli::Key.DOWN)
-  @screen.wait("d-i_GRUBdev.png", 10)
+  @screen.wait(diui_png("GRUBdev",ui_mode), 10)
   @screen.type(Sikuli::Key.ENTER)
 end
 
-Given /^I allow reboot after the install is complete$/ do
-  @screen.wait("d-i_InstallComplete.png", 2 * 60)
+Given /^in ([a-z]*) mode I allow reboot after the install is complete$/ do |ui_mode|
+  @screen.wait(diui_png("InstallComplete",ui_mode), 2 * 60)
   @screen.type(Sikuli::Key.ENTER)
 end
 
@@ -394,11 +507,7 @@ Given /^I wait for the reboot$/ do
   @screen.wait(bootsplash, 10 * 60)
 end
 
-Given /^I make sure that we boot from disk$/ do
-  @screen.wait("d-i_GRUB_Debian.png", 5 * 60)
-end
-
-Given /^I wait for a Login Prompt$/ do
+Given /^I should see a Login prompt$/ do
   @screen.wait("DebianLoginPromptVT.png", 2 * 60)
 end
 
diff --git a/cucumber/features/step_definitions/snapshots.rb b/cucumber/features/step_definitions/snapshots.rb
index 13e4a5b6..2e064107 100644
--- a/cucumber/features/step_definitions/snapshots.rb
+++ b/cucumber/features/step_definitions/snapshots.rb
@@ -2,201 +2,125 @@ def checkpoints
   {
     'boot-d-i-to-tasksel' => {
       :description => "I have started Debian Installer and stopped at the Tasksel prompt",
-      #:parent_checkpoint => 'no-network-logged-in',
+      :parent_checkpoint => nil,
       :steps => [
 	'I create a 8 GiB disk named "target"',
 	'I plug ide drive "target"',
 	'I start the computer',
-	'the computer boots DebianInstaller',
-	'I select British English',
-	'I accept the hostname, using "example.com" as the domain',
-	'I set the root password to "rootme"',
-	'I set the password for "Philip Hands" to be "verysecret"',
-	'I select full-disk, single-filesystem partitioning',
-	'I note that the Base system is being installed',
-	'I accept the default mirror',
-	'I ignore Popcon',
-	'we reach the Tasksel prompt',
+	'I boot the computer, and select text mode',
+	'in text mode I select British English',
+	'in text mode I accept the hostname, using "example.com" as the domain',
+	'in text mode I set the root password to "rootme"',
+	'in text mode I set the password for "Philip Hands" to be "verysecret"',
+	'in text mode I select full-disk, single-filesystem partitioning',
+	'in text mode I note that the Base system is being installed',
+	'in text mode I accept the default mirror',
+	'in text mode I ignore Popcon',
+	'in text mode we reach the Tasksel prompt',
       ],
     },
 
-    'debian-minimal-install' => {
-      :description => "I have installed Minimal Debian",
-      :parent_checkpoint => 'boot-d-i-to-tasksel',
+    'boot-g-i-to-tasksel' => {
+      :description => "I have started GUI Debian Installer and stopped at the Tasksel prompt",
+      :parent_checkpoint => nil,
       :steps => [
-	'I hit ENTER',
-	'I install GRUB',
-	'I allow reboot after the install is complete',
-	'I wait for the reboot',
-	'I power off the computer',
-	'the computer is set to boot from ide drive "target"',
+	'I create a 8 GiB disk named "target"',
+	'I plug ide drive "target"',
+	'I start the computer',
+	'I boot the computer, and select gui mode',
+	'in gui mode I select British English',
+	'in gui mode I accept the hostname, using "example.com" as the domain',
+	'in gui mode I set the root password to "rootme"',
+	'in gui mode I set the password for "Philip Hands" to be "verysecret"',
+	'in gui mode I select full-disk, single-filesystem partitioning',
+	'in gui mode I note that the Base system is being installed',
+	'in gui mode I accept the default mirror',
+	'in gui mode I ignore Popcon',
+	'in gui mode we reach the Tasksel prompt',
       ],
     },
 
-    'debian-gnome-install' => {
-      :description => "I have installed Gnome Desktop Debian",
+    'debian-console-install' => {
+      :description => "I install a non-GUI Debian system, in text mode",
       :parent_checkpoint => 'boot-d-i-to-tasksel',
       :steps => [
-	'I select the Desktop task',
-	'I install GRUB',
-	'I allow reboot after the install is complete',
+	'in text mode I unset the Desktop task',
+	'in text mode I wait while the bulk of the packages are installed',
+	'in text mode I install GRUB',
+	'in text mode I allow reboot after the install is complete',
 	'I wait for the reboot',
 	'I power off the computer',
 	'the computer is set to boot from ide drive "target"',
       ],
     },
 
-    'tails-greeter' => {
-      :description => "I have started Tails from DVD without network and stopped at Tails Greeter's login screen",
-      :parent_checkpoint => nil,
-      :steps => [
-        'the network is unplugged',
-        'I start the computer',
-        'the computer boots Tails'
-      ],
-    },
-
-    'no-network-logged-in' => {
-      :description => "I have started Tails from DVD without network and logged in",
-      :parent_checkpoint => "tails-greeter",
-      :steps => [
-        'I log in to a new session',
-        'Tails Greeter has dealt with the sudo password',
-        'the Tails desktop is ready',
-      ],
-    },
-
-    'with-no-network-and-i2p' => {
-      :temporary => true,
-      :description => 'I have started Tails from DVD with I2P enabled and logged in',
+    'debian-gui-console-install' => {
+      :description => "I install a non-GUI Debian system, in gui mode",
+      :parent_checkpoint => 'boot-g-i-to-tasksel',
       :steps => [
-        'I set Tails to boot with options "i2p"',
-        'the network is unplugged',
-        'I start the computer',
-        'the computer boots Tails',
-        'I log in to a new session',
-        'the Tails desktop is ready',
-      ],
-    },
-
-    'with-network-and-i2p' => {
-      :temporary => true,
-      :description => 'I have started Tails from DVD with I2P enabled and logged in and the network is connected',
-      :parent_checkpoint => "with-no-network-and-i2p",
-      :steps => [
-        'the network is plugged',
-        'Tor is ready',
-        'I2P is running',
-        'all notifications have disappeared',
-        'available upgrades have been checked',
-        "I2P's reseeding completed",
-      ],
-    },
-
-    'with-network-logged-in' => {
-      :description => "I have started Tails from DVD and logged in and the network is connected",
-      :parent_checkpoint => "no-network-logged-in",
-      :steps => [
-        'the network is plugged',
-        'Tor is ready',
-        'all notifications have disappeared',
-        'available upgrades have been checked',
-      ],
-    },
-
-    'no-network-bridge-mode' => {
-      :temporary => true,
-      :description => "I have started Tails from DVD without network and logged in with bridge mode enabled",
-      :parent_checkpoint => "tails-greeter",
-      :steps => [
-        'I enable more Tails Greeter options',
-        'I enable the specific Tor configuration option',
-        'I log in to a new session',
-        'Tails Greeter has dealt with the sudo password',
-        'the Tails desktop is ready',
-        'all notifications have disappeared',
-      ],
-    },
-
-    'no-network-logged-in-sudo-passwd' => {
-      :temporary => true,
-      :description => "I have started Tails from DVD without network and logged in with an administration password",
-      :parent_checkpoint => "tails-greeter",
-      :steps => [
-        'I enable more Tails Greeter options',
-        'I set an administration password',
-        'I log in to a new session',
-        'Tails Greeter has dealt with the sudo password',
-        'the Tails desktop is ready',
-      ],
-    },
-
-    'with-network-logged-in-sudo-passwd' => {
-      :temporary => true,
-      :description => "I have started Tails from DVD and logged in with an administration password and the network is connected",
-      :parent_checkpoint => "no-network-logged-in-sudo-passwd",
-      :steps => [
-        'the network is plugged',
-        'Tor is ready',
-        'all notifications have disappeared',
-        'available upgrades have been checked',
+	'in gui mode I unset the Desktop task',
+	'in gui mode I wait while the bulk of the packages are installed',
+	'in gui mode I install GRUB',
+	'in gui mode I allow reboot after the install is complete',
+	'I wait for the reboot',
+	'I power off the computer',
+	'the computer is set to boot from ide drive "target"',
       ],
     },
 
-    'usb-install-tails-greeter' => {
-      :description => "I have started Tails without network from a USB drive without a persistent partition and stopped at Tails Greeter's login screen",
-      :parent_checkpoint => 'no-network-logged-in',
+    'debian-minimal-install' => {
+      :description => "I install a Minimal Debian system, in text mode",
+      :parent_checkpoint => 'boot-d-i-to-tasksel',
       :steps => [
-        'I create a 4 GiB disk named "__internal"',
-        'I plug USB drive "__internal"',
-        'I "Clone & Install" Tails to USB drive "__internal"',
-        'the running Tails is installed on USB drive "__internal"',
-        'there is no persistence partition on USB drive "__internal"',
-        'I shutdown Tails and wait for the computer to power off',
-        'I start Tails from USB drive "__internal" with network unplugged',
-        'the boot device has safe access rights',
-        'Tails is running from USB drive "__internal"',
-        'there is no persistence partition on USB drive "__internal"',
-        'process "udev-watchdog" is running',
-        'udev-watchdog is monitoring the correct device',
+	'in text mode I unset the Desktop and Print tasks',
+	'in text mode I wait while the bulk of the packages are installed',
+	'in text mode I install GRUB',
+	'in text mode I allow reboot after the install is complete',
+	'I wait for the reboot',
+	'I power off the computer',
+	'the computer is set to boot from ide drive "target"',
       ],
     },
 
-    'usb-install-logged-in' => {
-      :description => "I have started Tails without network from a USB drive without a persistent partition and logged in",
-      :parent_checkpoint => 'usb-install-tails-greeter',
+    'debian-gui-minimal-install' => {
+      :description => "I install a Minimal Debian system, in gui mode",
+      :parent_checkpoint => 'boot-g-i-to-tasksel',
       :steps => [
-        'I log in to a new session',
-        'the Tails desktop is ready',
+	'in gui mode I unset the Desktop and Print tasks',
+	'in gui mode I wait while the bulk of the packages are installed',
+	'in gui mode I install GRUB',
+	'in gui mode I allow reboot after the install is complete',
+	'I wait for the reboot',
+	'I power off the computer',
+	'the computer is set to boot from ide drive "target"',
       ],
     },
 
-    'usb-install-with-persistence-tails-greeter' => {
-      :description => "I have started Tails without network from a USB drive with a persistent partition and stopped at Tails Greeter's login screen",
-      :parent_checkpoint => 'usb-install-logged-in',
+    'debian-gnome-install' => {
+      :description => "I install a Gnome Desktop Debian system, in text mode",
+      :parent_checkpoint => 'boot-d-i-to-tasksel',
       :steps => [
-        'I create a persistent partition',
-        'a Tails persistence partition exists on USB drive "__internal"',
-        'I shutdown Tails and wait for the computer to power off',
-        'I start Tails from USB drive "__internal" with network unplugged',
-        'the boot device has safe access rights',
-        'Tails is running from USB drive "__internal"',
-        'process "udev-watchdog" is running',
-        'udev-watchdog is monitoring the correct device',
+	'in text mode I select the Desktop task',
+	'in text mode I wait while the bulk of the packages are installed',
+	'in text mode I install GRUB',
+	'in text mode I allow reboot after the install is complete',
+	'I wait for the reboot',
+	'I power off the computer',
+	'the computer is set to boot from ide drive "target"',
       ],
     },
 
-    'usb-install-with-persistence-logged-in' => {
-      :description => "I have started Tails without network from a USB drive with a persistent partition enabled and logged in",
-      :parent_checkpoint => 'usb-install-with-persistence-tails-greeter',
+    'debian-gui-gnome-install' => {
+      :description => "I install a Gnome Desktop Debian system, in gui mode",
+      :parent_checkpoint => 'boot-g-i-to-tasksel',
       :steps => [
-        'I enable persistence',
-        'I log in to a new session',
-        'the Tails desktop is ready',
-        'all persistence presets are enabled',
-        'all persistent filesystems have safe access rights',
-        'all persistence configuration files have safe access rights',
-        'all persistent directories have safe access rights',
+	'in gui mode I select the Desktop task',
+	'in gui mode I wait while the bulk of the packages are installed',
+	'in gui mode I install GRUB',
+	'in gui mode I allow reboot after the install is complete',
+	'I wait for the reboot',
+	'I power off the computer',
+	'the computer is set to boot from ide drive "target"',
       ],
     },
   }