From 89cb4ecdf1c6dd3f3fd0aa75729e8e59edd5ad74 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Fri, 25 Aug 2017 15:18:39 +0800 Subject: [PATCH] Revise InfiniBand test case --- xCAT-test/autotest/testcase/infiniband/cases0 | 2 ++ .../testcase/infiniband/rhel-infiniband-diskfull-install.sh | 2 +- .../testcase/infiniband/rhel-infiniband-diskless-install.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xCAT-test/autotest/testcase/infiniband/cases0 b/xCAT-test/autotest/testcase/infiniband/cases0 index 568dfc1b1..4f8c043a1 100644 --- a/xCAT-test/autotest/testcase/infiniband/cases0 +++ b/xCAT-test/autotest/testcase/infiniband/cases0 @@ -1,9 +1,11 @@ start:rhel_infiniband_diskless_install +description:Intigration test of RHEL 7 and MLNX OFED for diskless installation. Need to set MLNX variable in the test configuration file. cmd:RHEL_ISO="$$ISO" LINUX_DISTRO="GETNODEATTR($$CN, os)" COMPUTE_NODE="$$CN" MLNX_ISO="$$MLNX" DKMS_RPM="$$DKMS" /opt/xcat/share/xcat/tools/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh check:rc==0 end start:rhel_infiniband_diskfull_install +description:Intigration test of RHEL 7 and MLNX OFED for diskfull installation. Need to set MLNX variable in the test configuration file. cmd:RHEL_ISO="$$ISO" LINUX_DISTRO="GETNODEATTR($$CN, os)" COMPUTE_NODE="$$CN" MLNX_ISO="$$MLNX" DKMS_RPM="$$DKMS" /opt/xcat/share/xcat/tools/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh check:rc==0 end diff --git a/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh b/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh index 3bc6fc7d0..7085a7545 100755 --- a/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh +++ b/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh @@ -145,7 +145,7 @@ mkdir -p "${OSIMAGE_OTHERPKGDIR}" mkdir -p "${OSIMAGE_OTHERPKGDIR}"/dkms [ -f "${DKMS_RPM}" ] -[ "$?" -ne "0" ] && echo "File ${DKMS_RPM} not found." >&2 && exit 1 +[ "$?" -ne "0" ] && echo "File ${DKMS_RPM} not found." >&2 cp "${DKMS_RPM}" "${OSIMAGE_OTHERPKGDIR}/dkms" ( cd "${OSIMAGE_OTHERPKGDIR}" && createrepo . ) diff --git a/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh b/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh index 014ef8082..f29cc891e 100755 --- a/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh +++ b/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh @@ -154,7 +154,7 @@ mkdir -p "${OSIMAGE_OTHERPKGDIR}" mkdir -p "${OSIMAGE_OTHERPKGDIR}"/dkms [ -f "${DKMS_RPM}" ] -[ "$?" -ne "0" ] && echo "File ${DKMS_RPM} not found." >&2 && exit 1 +[ "$?" -ne "0" ] && echo "File ${DKMS_RPM} not found." >&2 cp "${DKMS_RPM}" "${OSIMAGE_OTHERPKGDIR}/dkms" ( cd "${OSIMAGE_OTHERPKGDIR}" && createrepo . )