summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cucumber/features/install.feature35
-rw-r--r--job-cfg/lvc.yaml18
2 files changed, 43 insertions, 10 deletions
diff --git a/cucumber/features/install.feature b/cucumber/features/install.feature
index 4ea97b33..d31d08be 100644
--- a/cucumber/features/install.feature
+++ b/cucumber/features/install.feature
@@ -3,6 +3,7 @@ Feature: Doing variations on d-i installs
As a normal user
I should be able to install Debian
+ @both-ui
Scenario Outline: Install Debian, and boot to a login prompt
Given I install a <target_ui> Debian system, in <install_ui> mode
When I start the computer
@@ -11,11 +12,35 @@ Feature: Doing variations on d-i installs
Examples:
| install_ui | target_ui | login |
| gui | minimal | VT |
- | gui | Gnome | Gnome |
- | gui | LXDE | LXDE |
- | gui | XFCE | XFCE |
- | gui | KDE | KDE |
-# | text | non-GUI | VT |
+ | text | non-GUI | VT |
+ #| gui | Gnome | Gnome |
+ #| gui | LXDE | LXDE |
+ #| gui | XFCE | XFCE |
+ #| gui | KDE | KDE |
+
+ @gui
+ Scenario Outline: Install Debian, and boot to a login prompt
+ Given I install a <target_ui> Debian system, in gui mode
+ When I start the computer
+ Then I should see a <login> Login prompt
+
+ Examples:
+ | target_ui | login |
+ | non-GUI | VT |
+ | LXDE | LXDE |
+ | KDE | KDE |
+
+ @text-ui
+ Scenario Outline: Install Debian, and boot to a login prompt
+ Given I install a <target_ui> Debian system, in text mode
+ When I start the computer
+ Then I should see a <login> Login prompt
+
+ Examples:
+ | target_ui | login |
+ | minimal | VT |
+ | Gnome | Gnome |
+ | LXDE | LXDE |
@broken
Scenario: Attempt to Install Gnome, expecting it to fail because X doesn't start for some reason
diff --git a/job-cfg/lvc.yaml b/job-cfg/lvc.yaml
index f81898eb..a1a50e99 100644
--- a/job-cfg/lvc.yaml
+++ b/job-cfg/lvc.yaml
@@ -56,7 +56,8 @@
my_title: 'Cucumber: {dist_name}'
my_time: '45 23 31 12 *'
my_pngs: 'results/*.png'
- my_opts: '--tags ~@broken --tags ~@trivial --tags ~@preseed'
+ my_opts: '--tags both-ui'
+ my_opts: '--tags ~@broken --tags ~@trivial --tags ~@preseed --tags ~@text-ui --tags ~@gui'
my_description: 'Work in progress...'
jobs:
- '{name}_{distro}':
@@ -64,14 +65,21 @@
- 'debian-stable':
dist_name: 'Debian-Installer Stable'
my_iso: 'http://cdimage.debian.org/debian-cd/8.6.0/amd64/iso-cd/debian-8.6.0-amd64-netinst.iso'
+ my_time: 'H H * * H'
- 'debian-testing-daily':
dist_name: 'Debian-Installer Testing (Daily)'
my_iso: 'http://cdimage.debian.org/cdimage/daily-builds/daily/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso'
- my_time: 'H */8 * * *'
- - 'debian-testing-netboot-daily':
- dist_name: 'Debian-Installer Testing Netboot (Daily)'
+ my_time: 'H H/8 * * *'
+ - 'debian-DI-miniiso-gui-daily':
+ dist_name: 'Debian-Installer Testing GTK-miniiso (Daily)'
my_iso: 'https://d-i.debian.org/daily-images/amd64/daily/netboot/gtk/mini.iso'
- my_time: 'H */8 * * *'
+ my_time: 'H H/8 * * *'
+ my_opts: '--tags @gui'
+ - 'debian-DI-miniiso-text-daily':
+ dist_name: 'Debian-Installer Testing Text-miniiso (Daily)'
+ my_iso: 'https://d-i.debian.org/daily-images/amd64/daily/netboot/mini.iso'
+ my_time: 'H H/8 * * *'
+ my_opts: '--tags @text-ui'
- 'debian-miniiso':
dist_name: 'Debian-Installer local mini.iso'
my_iso: 'use_TRIGGERING_BRANCH'