From patchwork Tue Dec 13 05:29:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhen Ren X-Patchwork-Id: 9471775 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C70CA60760 for ; Tue, 13 Dec 2016 05:31:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B7E3528528 for ; Tue, 13 Dec 2016 05:31:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC9D928541; Tue, 13 Dec 2016 05:31:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 354C928528 for ; Tue, 13 Dec 2016 05:31:37 +0000 (UTC) Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uBD5V4rY001278 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 13 Dec 2016 05:31:04 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id uBD5V12T012712 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Dec 2016 05:31:02 GMT Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1cGfg5-0007rw-LP; Mon, 12 Dec 2016 21:31:01 -0800 Received: from aserv0021.oracle.com ([141.146.126.233]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1cGffL-0007oT-Dc; Mon, 12 Dec 2016 21:30:15 -0800 Received: from userp1030.oracle.com (userp1030.oracle.com [156.151.31.80]) by aserv0021.oracle.com (8.13.8/8.14.4) with ESMTP id uBD5UEG2008043 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Dec 2016 05:30:15 GMT Received: from userp2030.oracle.com (userp2030.oracle.com [156.151.31.89]) by userp1030.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uBD5UE7L019309 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 13 Dec 2016 05:30:14 GMT Received: from pps.filterd (userp2030.oracle.com [127.0.0.1]) by userp2030.oracle.com (8.16.0.17/8.16.0.17) with SMTP id uBD5ROCU011888; Tue, 13 Dec 2016 05:30:14 GMT Authentication-Results: oracle.com; spf=pass smtp.mailfrom=zren@suse.com Received: from prv3-mh.provo.novell.com (prv3-mh.provo.novell.com [137.65.250.26]) by userp2030.oracle.com with ESMTP id 278b21rjau-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Dec 2016 05:30:14 +0000 Received: from laptop.apac.novell.com (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) by prv3-mh.provo.novell.com with ESMTP (TLS encrypted); Mon, 12 Dec 2016 22:30:07 -0700 From: Eric Ren To: ocfs2-test-devel@oss.oracle.com Date: Tue, 13 Dec 2016 13:29:20 +0800 Message-Id: <1481606975-13186-3-git-send-email-zren@suse.com> X-Mailer: git-send-email 2.6.6 In-Reply-To: <1481606975-13186-1-git-send-email-zren@suse.com> References: <1481606975-13186-1-git-send-email-zren@suse.com> X-PDR: PASS X-ServerName: prv3-mh.provo.novell.com X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 include:microfocus.com ~all X-Proofpoint-Virus-Version: vendor=nai engine=5800 definitions=8377 signatures=670775 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1612130094 Cc: ocfs2-devel@oss.oracle.com Subject: [Ocfs2-devel] [PATCH 02/17] Single Run: kernel building is little broken now X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Source-IP: userv0021.oracle.com [156.151.31.71] X-Virus-Scanned: ClamAV using ClamSMTP Only check kernel source if we specify "buildkernel" test case. The original kernel source web-link cannot be reached, so give a new link instead but the md5sum check is missing now. Signed-off-by: Eric Ren --- programs/python_common/single_run-WIP.sh | 56 ++++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/programs/python_common/single_run-WIP.sh b/programs/python_common/single_run-WIP.sh index fe0056c..61008d8 100755 --- a/programs/python_common/single_run-WIP.sh +++ b/programs/python_common/single_run-WIP.sh @@ -20,9 +20,9 @@ WGET=`which wget` WHOAMI=`which whoami` SED=`which sed` -DWNLD_PATH="http://oss.oracle.com/~smushran/ocfs2-test" -KERNEL_TARBALL="linux-kernel.tar.gz" -KERNEL_TARBALL_CHECK="${KERNEL_TARBALL}.md5sum" +DWNLD_PATH="https://cdn.kernel.org/pub/linux/kernel/v3.x/" +KERNEL_TARBALL="linux-3.2.80.tar.xz" +#KERNEL_TARBALL_CHECK="${KERNEL_TARBALL}.md5sum" USERID=`${WHOAMI}` DEBUGFS_BIN="${SUDO} `which debugfs.ocfs2`" @@ -85,7 +85,7 @@ get_bits() # get_kernel_source $LOGDIR $DWNLD_PATH $KERNEL_TARBALL $KERNEL_TARBALL_CHECK get_kernel_source() { - if [ "$#" -lt "4" ]; then + if [ "$#" -lt "3" ]; then ${ECHO} "Error in get_kernel_source()" exit 1 fi @@ -93,18 +93,18 @@ get_kernel_source() logdir=$1 dwnld_path=$2 kernel_tarball=$3 - kernel_tarball_check=$4 + #kernel_tarball_check=$4 cd ${logdir} outlog=get_kernel_source.log - ${WGET} -o ${outlog} ${dwnld_path}/${kernel_tarball_check} - if [ $? -ne 0 ]; then - ${ECHO} "ERROR downloading ${dwnld_path}/${kernel_tarball_check}" - cd - - exit 1 - fi +# ${WGET} -o ${outlog} ${dwnld_path}/${kernel_tarball_check} +# if [ $? -ne 0 ]; then +# ${ECHO} "ERROR downloading ${dwnld_path}/${kernel_tarball_check}" +# cd - +# exit 1 +# fi ${WGET} -a ${outlog} ${dwnld_path}/${kernel_tarball} if [ $? -ne 0 ]; then @@ -113,13 +113,13 @@ get_kernel_source() exit 1 fi - ${MD5SUM} -c ${kernel_tarball_check} >>${outlog} 2>&1 - if [ $? -ne 0 ]; then - ${ECHO} "ERROR ${kernel_tarball_check} check failed" - cd - - exit 1 - fi - cd - +# ${MD5SUM} -c ${kernel_tarball_check} >>${outlog} 2>&1 +# if [ $? -ne 0 ]; then +# ${ECHO} "ERROR ${kernel_tarball_check} check failed" +# cd - +# exit 1 +# fi +# cd - } # do_format() ${BLOCKSIZE} ${CLUSTERSIZE} ${FEATURES} ${DEVICE} @@ -1012,16 +1012,6 @@ LOGFILE=${LOGDIR}/single_run.log do_mkdir ${LOGDIR} -if [ -z ${KERNELSRC} ]; then - get_kernel_source $LOGDIR $DWNLD_PATH $KERNEL_TARBALL $KERNEL_TARBALL_CHECK - KERNELSRC=${LOGDIR}/${KERNEL_TARBALL} -fi - -if [ ! -f ${KERNELSRC} ]; then - ${ECHO} "No kernel source" - usage -fi - STARTRUN=$(date +%s) log_message "*** Start Single Node test ***" @@ -1058,6 +1048,16 @@ for tc in `${ECHO} ${TESTCASES} | ${SED} "s:,: :g"`; do fi if [ "$tc"X = "buildkernel"X -o "$tc"X = "all"X ];then + if [ -z ${KERNELSRC} ]; then + get_kernel_source $LOGDIR $DWNLD_PATH $KERNEL_TARBALL #$KERNEL_TARBALL_CHECK + KERNELSRC=${LOGDIR}/${KERNEL_TARBALL} + fi + + if [ ! -f ${KERNELSRC} ]; then + ${ECHO} "No kernel source" + usage + fi + run_buildkernel ${LOGDIR} ${DEVICE} ${MOUNTPOINT} ${KERNELSRC} fi