summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiang, Yunhong <yunhong.jiang@intel.com>2017-03-07 08:10:06 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-07 08:10:06 +0000
commit0c2f88aa2ccffc538c276caac88da6841107bf81 (patch)
tree19210bac3be5857d7f95dce242df9920c9d49f71
parentb345dcdf3a6a7ebf19d2932e009f16fc3f51c84e (diff)
parent570d93ddbb5e5e54aec9a7c1faf0c24204229c59 (diff)
Merge "This patch includes host and guest configuration script updates to install kvmfornfv built kernel and configure the grub for executing test cases on latest installed kernel."
-rwxr-xr-xci/envs/guest-setup0.sh3
-rwxr-xr-xci/envs/host-setup0.sh4
2 files changed, 4 insertions, 3 deletions
diff --git a/ci/envs/guest-setup0.sh b/ci/envs/guest-setup0.sh
index 301d34cbe..fb3133b9f 100755
--- a/ci/envs/guest-setup0.sh
+++ b/ci/envs/guest-setup0.sh
@@ -64,5 +64,6 @@ config_grub 'idle' 'poll'
## Disable clocksource verification at runtime
config_grub 'tsc' 'reliable'
-grub2-mkconfig -o /boot/grub2/grub.cfg
+sed -ie 's/saved/0/g' /etc/default/grub
install_kernel
+grub2-mkconfig -o /boot/grub2/grub.cfg
diff --git a/ci/envs/host-setup0.sh b/ci/envs/host-setup0.sh
index 0778aae96..1bd7f1205 100755
--- a/ci/envs/host-setup0.sh
+++ b/ci/envs/host-setup0.sh
@@ -76,6 +76,6 @@ config_grub 'idle' 'poll'
## Disable clocksource verification at runtime
config_grub 'tsc' 'reliable'
-grub2-mkconfig -o /boot/grub2/grub.cfg
-
install_kernel
+
+grub2-mkconfig -o /boot/grub2/grub.cfg