From c7a9bfe0d40e17aa76484d5e3c83995042345661 Mon Sep 17 00:00:00 2001 From: Philip Hands Date: Wed, 8 Mar 2017 12:47:41 +0100 Subject: lvc: add a 'running ...' step for remote commands, and use it this includes a new @bugtest scenario for testing the patch for #853855 Signed-off-by: Holger Levsen --- cucumber/features/install.feature | 36 +++++++++++++++++++++- cucumber/features/step_definitions/common_steps.rb | 5 +++ job-cfg/lvc.yaml | 7 ++++- 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/cucumber/features/install.feature b/cucumber/features/install.feature index cb918ba3..93d1c332 100644 --- a/cucumber/features/install.feature +++ b/cucumber/features/install.feature @@ -75,16 +75,50 @@ Feature: Doing variations on d-i installs And I intend to use gui mode And I intend to boot with options: auto=true priority=critical wibble.foo=bar url=hands.com classes=jenkins.debian.org/pb10;loc/gb;hands.com/general-tweaks;setup/users;partition/atomic;desktop/lxde hands-off/checksigs=true DEBCONF_DEBUG=5 And I start the computer - And I select the install mode And I execute "grep wibble /proc/cmdline" + And I execute "ls /var/lib/register-module" + And I select the install mode And I expect package installation to start And I execute "ls /var/lib/register-module" + And I execute "grep wibble /target/etc/modprobe.d/local.conf" And I wait while the bulk of the packages are installed + And I execute "grep wibble /target/boot/grub/grub.cfg" And the VM shuts down within 20 minutes When the computer is set to boot from ide drive And I start the computer Then I should see a LXDE Login prompt + @bugtest + Scenario: Preseed using hands.com with checksum + Given a disk is created for Debian Installer tests + And I intend to use gui mode + And I intend to boot with options: wibble.foo=bar fsck.bar=baz + And I start the computer + And I select the install mode + And I select British English + And running "grep wibble /proc/cmdline" succeeds + And running "cat /var/lib/register-module/wibble.params" succeeds + And I accept the hostname, using "example.com" as the domain + And I set the root password to "rootme" + And I set the password for "Philip Hands" to be "verysecret" + And I select full-disk, single-filesystem partitioning + And I note that the Base system is being installed + And I accept the default mirror + And I ignore Popcon + And we reach the Tasksel prompt + And I select the LXDE task + And running "grep wibble /target/etc/modprobe.d/local.conf" succeeds + And running "grep fsck /target/etc/modprobe.d/local.conf" fails + And I wait while the bulk of the packages are installed + And I install GRUB + And running "grep wibble /target/boot/grub/grub.cfg" succeeds + And I allow reboot after the install is complete + And I wait for the reboot + And I power off the computer + And the computer is set to boot from ide drive + When I start the computer + Then I should see a LXDE Login prompt + @debedu Scenario: Install default Debian-Edu Given a disk is created for Debian Edu tests diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb index 6f47bb93..0cebc1a3 100644 --- a/cucumber/features/step_definitions/common_steps.rb +++ b/cucumber/features/step_definitions/common_steps.rb @@ -212,6 +212,11 @@ When /^I execute "([^"]*)"$/ do |cmd| info_log($vm.execute(cmd)) end +When /^running "([^"]*)" (.*)$/ do |cmd, outcome| + result = $vm.execute(cmd) + assert(result.success? == ('succeeds' == outcome), + "Attempting to run '#{cmd}' did not give the expected outcome of: #{outcome}\n" + result.to_s ) +end Given /^I start Tails( from DVD)?( with network unplugged)?( and I login)?$/ do |dvd_boot, network_unplugged, do_login| step "the computer is set to boot from the Tails DVD" if dvd_boot diff --git a/job-cfg/lvc.yaml b/job-cfg/lvc.yaml index a9a26b3a..fe8ccefb 100644 --- a/job-cfg/lvc.yaml +++ b/job-cfg/lvc.yaml @@ -83,7 +83,12 @@ - 'debian-miniiso': dist_name: 'Debian-Installer local mini.iso' my_iso: 'use_TRIGGERING_BRANCH' - my_opts: '--tags @preseed' + my_opts: '--tags @bugtest' + - 'debian-DI-miniiso-gui-daily-bugtest': + dist_name: 'Debian-Installer Testing GTK-miniiso (Daily) bugtest' + my_iso: 'https://d-i.debian.org/daily-images/amd64/daily/netboot/gtk/mini.iso' + my_time: 'H H/8 * * *' + my_opts: '--tags @bugtest' - 'debian-stretch-DI': dist_name: 'Debian-Installer Stretch pre-release' my_iso: 'http://cdimage.debian.org/cdimage/stretch_di_rc2/amd64/iso-cd/debian-stretch-DI-rc2-amd64-netinst.iso' -- cgit v1.2.3-70-g09d2