aboutsummaryrefslogtreecommitdiffstats
path: root/nfvbenchvm
diff options
context:
space:
mode:
authorYichen Wang <yicwang@cisco.com>2017-09-08 17:07:56 -0700
committerYichen Wang <yicwang@cisco.com>2017-09-08 17:24:27 -0700
commitd05d0c07856534e439792f86e1c1885850e9ad44 (patch)
tree7941504c80635d6712410491271e42b59f3329d4 /nfvbenchvm
parent46f94badf4feadcf64f57071d99f7ccd86f19ed9 (diff)
[NFVBENCH-20] Use updated kernel for the image1.0.6
1. Update testpmd to DPDK 17.05.2; 2. Update VPP to 17.07-30; 3. Fix the script to use the new kernel; buildvm Change-Id: Icd62ff1c383598db4f80bc9b36794ff0f8d0e56c Signed-off-by: Yichen Wang <yicwang@cisco.com>
Diffstat (limited to 'nfvbenchvm')
-rwxr-xr-xnfvbenchvm/dib/build-image.sh2
-rwxr-xr-xnfvbenchvm/dib/elements/nfvbenchvm/finalise.d/53-boot-from-new-kernel3
-rwxr-xr-xnfvbenchvm/dib/elements/nfvbenchvm/post-install.d/02-testpmd-script4
-rw-r--r--nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local4
4 files changed, 8 insertions, 5 deletions
diff --git a/nfvbenchvm/dib/build-image.sh b/nfvbenchvm/dib/build-image.sh
index 3ff4696..9326762 100755
--- a/nfvbenchvm/dib/build-image.sh
+++ b/nfvbenchvm/dib/build-image.sh
@@ -11,7 +11,7 @@ set -e
gs_url=artifacts.opnfv.org/nfvbench/images
# image version number
-__version__=0.3
+__version__=0.4
image_name=nfvbenchvm_centos-$__version__
# if image exists skip building
diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/finalise.d/53-boot-from-new-kernel b/nfvbenchvm/dib/elements/nfvbenchvm/finalise.d/53-boot-from-new-kernel
new file mode 100755
index 0000000..6607b0b
--- /dev/null
+++ b/nfvbenchvm/dib/elements/nfvbenchvm/finalise.d/53-boot-from-new-kernel
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+grubby --set-default-index=0
diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/02-testpmd-script b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/02-testpmd-script
index b1cffc5..acdc6a3 100755
--- a/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/02-testpmd-script
+++ b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/02-testpmd-script
@@ -1,7 +1,7 @@
#!/bin/bash
-DPDK=dpdk-17.05
-DPDK_UNTAR=dpdk-17.05
+DPDK=dpdk-17.05.2
+DPDK_UNTAR=dpdk-stable-17.05.2
# pick up the kernel version for the target image
kernel_version=`ls -t /lib/modules | awk 'NR==1 {print}'`
diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local
index 114dd54..596cfdb 100644
--- a/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local
+++ b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local
@@ -11,7 +11,7 @@ until [ $retry -eq 0 ]; do
sleep 2
done
if [ ! -f $NFVBENCH_CONF ]; then
- exit 0
+ exit 0
fi
# Parse and obtain all configurations
@@ -62,7 +62,7 @@ else
echo "Configuring vpp..."
cp /vpp/startup.conf /etc/vpp/startup.conf
cp /vpp/vm.conf /etc/vpp/vm.conf
-
+
sed -i "s/{{PCI_ADDRESS_1}}/$PCI_ADDRESS_1/g" /etc/vpp/startup.conf
sed -i "s/{{PCI_ADDRESS_2}}/$PCI_ADDRESS_2/g" /etc/vpp/startup.conf
sed -i "s/{{WORKER_CORES}}/$WORKER_CORES/g" /etc/vpp/startup.conf