Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Execution of Livemigration through Yardstick
[kvmfornfv.git]
/
ci
/
envs
/
host-setup0.sh
diff --git
a/ci/envs/host-setup0.sh
b/ci/envs/host-setup0.sh
index
eeb91c1
..
e852726
100755
(executable)
--- a/
ci/envs/host-setup0.sh
+++ b/
ci/envs/host-setup0.sh
@@
-9,10
+9,17
@@
## http://www.apache.org/licenses/LICENSE-2.0
###############################################################################
## http://www.apache.org/licenses/LICENSE-2.0
###############################################################################
+source utils.sh
source host-config
source host-config
+KERNEL_VERSION=$( getKernelVersion )
+if [ -z $KERNEL_VERSION ];then
+ echo "Kernel RPM not found"
+ exit 1
+fi
rpmdir=${1:-"/root/workspace/rpm/"}
rpmdir=${1:-"/root/workspace/rpm/"}
-rpmpat="kernel-4.1*.rpm"
+rpmpat="kernel-${KERNEL_VERSION}*.rpm"
+rpmdev="kernel-devel-${KERNEL_VERSION}*.rpm"
config_grub () {
key=$1
config_grub () {
key=$1
@@
-25,7
+32,7
@@
config_grub () {
fi
}
fi
}
-# The script's caller should passing the rpm directory that is built out from
+# The script's caller should passing the rpm directory that is built out from
# build.sh. The default rpmdir is the one used by yardstick scripts.
install_kernel () {
# Install the kernel rpm
# build.sh. The default rpmdir is the one used by yardstick scripts.
install_kernel () {
# Install the kernel rpm
@@
-40,7
+47,9
@@
install_kernel () {
exit 1
else
krpm=`find "${rpmdir}" -name "${rpmpat}"`
exit 1
else
krpm=`find "${rpmdir}" -name "${rpmpat}"`
+ kdrpm=`find "${rpmdir}" -name "${rpmdev}"`
rpm -ihv $krpm
rpm -ihv $krpm
+ rpm -ihv $kdrpm
fi
}
fi
}
@@
-70,7
+79,6
@@
config_grub 'idle' 'poll'
## Disable clocksource verification at runtime
config_grub 'tsc' 'reliable'
## Disable clocksource verification at runtime
config_grub 'tsc' 'reliable'
-sed -i s/GRUB_DEFAULT=saved/GRUB_DEFAULT=0/ /etc/default/grub
-grub2-mkconfig -o /boot/grub2/grub.cfg
-
install_kernel
install_kernel
+
+grub2-mkconfig -o /boot/grub2/grub.cfg