summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2015-09-18 13:38:49 -0400
committerBill Peck <bpeck@redhat.com>2015-09-18 13:38:49 -0400
commit4e251448551c3d6d941434d9dbbc73779f672a31 (patch)
tree776345d53052476a3e04f42f2a0d25814d4c0ede
parent8095c950ea1e044c9f241106ce3ba1649ea77fe3 (diff)
downloadtests-4e251448551c3d6d941434d9dbbc73779f672a31.tar.gz
tests-4e251448551c3d6d941434d9dbbc73779f672a31.tar.xz
tests-4e251448551c3d6d941434d9dbbc73779f672a31.zip
Don't use rhts-boot since it changes the next boot entry!
-rwxr-xr-xfirmware/amd_seattle/runtest.sh2
-rw-r--r--restraint/config/dist-5E-eso.json4
2 files changed, 4 insertions, 2 deletions
diff --git a/firmware/amd_seattle/runtest.sh b/firmware/amd_seattle/runtest.sh
index b5b4323..2b3ddc0 100755
--- a/firmware/amd_seattle/runtest.sh
+++ b/firmware/amd_seattle/runtest.sh
@@ -12,7 +12,7 @@ reboot_to_efi_shell() {
efishell=$(efibootmgr | grep 'Built-in EFI Shell' | cut -c5-8 | head -n 1)
# set next boot to efi shell
efibootmgr -n $efishell
- rhts-reboot
+ shutdown -r now
}
if [ -n "$RSTRNT_REBOOTCOUNT" ]; then
diff --git a/restraint/config/dist-5E-eso.json b/restraint/config/dist-5E-eso.json
index 3a6a4ee..e269f3e 100644
--- a/restraint/config/dist-5E-eso.json
+++ b/restraint/config/dist-5E-eso.json
@@ -12,8 +12,10 @@
"arch": "X86_64",
"hostrequire": [],
"ks_meta": {
- "restraint": "http://file.bos.redhat.com/~bpeck/restraint/el5/"
+ "restraint": "http://file.bos.redhat.com/~bpeck/restraint/el5/",
+ "duration": "172800"
},
+ "taskparam": [ { "RESERVETIME" : "172800" } ],
"bkr_data": {
"role": "Standalone",
"name": "AppServer"