Use + for START_AFTER_TEST as well as HDD_1 when appropriate

As with HDD_1, we want to override the scheduler-provided value
for update test runs, for these two tests.
This commit is contained in:
Adam Williamson 2017-07-27 15:14:09 -07:00
parent c11e08df20
commit 258412ec4b

View File

@ -2743,7 +2743,10 @@
{ key => "POSTINSTALL", value => "server_cockpit_basic" }, { key => "POSTINSTALL", value => "server_cockpit_basic" },
{ key => "USER_LOGIN", value => "false" }, { key => "USER_LOGIN", value => "false" },
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },
{ key => "START_AFTER_TEST", value => "server_cockpit_default" }, # to understand the '+' values in this test and the next,
# see the `jobs_from_update` docstring in fedora_openqa
# schedule.py
{ key => "+START_AFTER_TEST", value => "server_cockpit_default" },
{ key => "BOOTFROM", value => "c" }, { key => "BOOTFROM", value => "c" },
{ key => "+HDD_1", value => "disk_%MACHINE%_cockpit.qcow2" }, { key => "+HDD_1", value => "disk_%MACHINE%_cockpit.qcow2" },
], ],
@ -2754,7 +2757,7 @@
{ key => "POSTINSTALL", value => "realmd_join_cockpit freeipa_webui freeipa_password_change freeipa_client" }, { key => "POSTINSTALL", value => "realmd_join_cockpit freeipa_webui freeipa_password_change freeipa_client" },
{ key => "USER_LOGIN", value => "false" }, { key => "USER_LOGIN", value => "false" },
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },
{ key => "START_AFTER_TEST", value => "server_cockpit_default" }, { key => "+START_AFTER_TEST", value => "server_cockpit_default" },
{ key => "PARALLEL_WITH", value => "server_role_deploy_domain_controller" }, { key => "PARALLEL_WITH", value => "server_role_deploy_domain_controller" },
{ key => "BOOTFROM", value => "c" }, { key => "BOOTFROM", value => "c" },
{ key => "+HDD_1", value => "disk_%MACHINE%_cockpit.qcow2" }, { key => "+HDD_1", value => "disk_%MACHINE%_cockpit.qcow2" },