summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkalyanreddy <reddyx.gundarapu@intel.com>2017-02-23 15:36:05 +0530
committerKalyan reddy Gundarapu <reddyx.gundarapu@intel.com>2017-02-28 05:16:40 +0000
commitac6ed7c1037d6734a622bfe7f4bcb1bbac099ff0 (patch)
treefdfb3be1ed6d9bac3c5151ddcd327215ba117b11
parentd0deb639c35881c25f2b5ca77d64de0d4c649841 (diff)
This patch includes updated kernel config file to enable
CIFS and FUSE modules and updated scripts to check whether the node is up and running before execution of each test case. Change-Id: Ieebb693229d24e89d7ce92b0c1a26de411cce590 Signed-off-by: Gundarapu Kalyan Reddy <reddyx.gundarapu@intel.com>
-rwxr-xr-xci/cyclicTestTrigger.sh23
-rwxr-xr-xci/test_kvmfornfv.sh4
-rw-r--r--kernel/arch/x86/configs/opnfv.config21
3 files changed, 44 insertions, 4 deletions
diff --git a/ci/cyclicTestTrigger.sh b/ci/cyclicTestTrigger.sh
index b10acddd1..7ec3616a0 100755
--- a/ci/cyclicTestTrigger.sh
+++ b/ci/cyclicTestTrigger.sh
@@ -36,6 +36,29 @@ function verifyGuestImage {
fi
}
+#Verifying the availability of the host after reboot
+function connect_host {
+ n=0
+ while [ $n -lt 25 ]; do
+ host_ping_test="ping -c 1 ${HOST_IP}"
+ eval $host_ping_test &> /dev/null
+ if [ ${?} -ne 0 ] ; then
+ sleep 10
+ echo "host machine is still under reboot..trying to connect...."
+ n=$(($n+1))
+ else
+ echo "resuming the execution of test cases....."
+ #Waiting for ssh to be available for the host machine.
+ sleep 30
+ break
+ fi
+ if [ $n == 24 ];then
+ echo "Host machine unable to boot-up!"
+ exit 1
+ fi
+ done
+}
+
#Updating the pod.yaml file with HOST_IP,kvmfornfv_cyclictest_idle_idle.yaml with loops and interval
function updateYaml {
cd $WORKSPACE/tests/
diff --git a/ci/test_kvmfornfv.sh b/ci/test_kvmfornfv.sh
index e87d6eb40..6a6d70c42 100755
--- a/ci/test_kvmfornfv.sh
+++ b/ci/test_kvmfornfv.sh
@@ -35,6 +35,10 @@ function packetForward {
function cyclictest {
test_case=$1
source $WORKSPACE/ci/cyclicTestTrigger.sh $HOST_IP $test_time $test_type $test_case
+ #Verifying whether the test node is up and running
+ connect_host
+ #Waiting for ssh to be available for the host machine.
+ sleep 10
#calculating and verifying sha512sum of the guestimage.
if ! verifyGuestImage;then
exit 1
diff --git a/kernel/arch/x86/configs/opnfv.config b/kernel/arch/x86/configs/opnfv.config
index ad950c760..7e0170235 100644
--- a/kernel/arch/x86/configs/opnfv.config
+++ b/kernel/arch/x86/configs/opnfv.config
@@ -3821,7 +3821,8 @@ CONFIG_QFMT_V2=y
CONFIG_QUOTACTL=y
CONFIG_QUOTACTL_COMPAT=y
CONFIG_AUTOFS4_FS=y
-# CONFIG_FUSE_FS is not set
+CONFIG_FUSE_FS=m
+# CONFIG_CUSE is not set
# CONFIG_OVERLAY_FS is not set
#
@@ -3921,7 +3922,19 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_CEPH_FS=m
CONFIG_CEPH_FSCACHE=y
CONFIG_CEPH_FS_POSIX_ACL=y
-# CONFIG_CIFS is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_ACL=y
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SMB2=y
+# CONFIG_CIFS_SMB311 is not set
+CONFIG_CIFS_FSCACHE=y
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not set
@@ -4314,7 +4327,7 @@ CONFIG_CRYPTO_XTS=m
#
# Hash modes
#
-# CONFIG_CRYPTO_CMAC is not set
+CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_HMAC=y
# CONFIG_CRYPTO_XCBC is not set
# CONFIG_CRYPTO_VMAC is not set
@@ -4331,7 +4344,7 @@ CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
CONFIG_CRYPTO_GHASH=y
# CONFIG_CRYPTO_POLY1305 is not set
# CONFIG_CRYPTO_POLY1305_X86_64 is not set
-# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
# CONFIG_CRYPTO_MICHAEL_MIC is not set
# CONFIG_CRYPTO_RMD128 is not set