xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-24 15:05:36 +00:00
Code Issues Releases Wiki Activity

Fix minor problems

Browse Source
This commit is contained in:
GONG Jie
2017-08-04 16:39:42 +08:00
parent 29d045ae15
commit 44061e54c6
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh
View File

@ -123,7 +123,7 @@ ${OSIMAGE_NAME}:
provmethod=install
template=/opt/xcat/share/xcat/install/rh/compute.${LINUX_DISTRO%%.*}.tmpl
EOF
[ "$?" -ne "0" ] && echo "Make node definition failed." >&2 && exit 1
[ "$?" -ne "0" ] && echo "Make osimage definition failed." >&2 && exit 1
rm -rf "${OSIMAGE_OTHERPKGDIR}"
mkdir -p "${OSIMAGE_OTHERPKGDIR}"

2
xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh
View File

@ -128,7 +128,7 @@ ${OSIMAGE_NAME}:
provmethod=netboot
rootimgdir=${OSIMAGE_ROOTIMGDIR}
EOF
[ "$?" -ne "0" ] && echo "Make node definition failed." >&2 && exit 1
[ "$?" -ne "0" ] && echo "Make osimage definition failed." >&2 && exit 1
rm -rf "${OSIMAGE_OTHERPKGDIR}"
mkdir -p "${OSIMAGE_OTHERPKGDIR}"

6
xCAT-test/autotest/testcase/cuda/ubuntu-cuda-diskfull-install.sh
View File

@ -127,12 +127,12 @@ ${OSIMAGE_NAME}:
osvers=${LINUX_DISTRO}
otherpkgdir=${OSIMAGE_OTHERPKGDIR}/var/cuda/repo-8-0-local-ga2v2,http://ports.ubuntu.com/ubuntu-ports/ xenial
pkgdir=/install/${LINUX_DISTRO}/${LINUX_ARCH}
pkglist=/opt/xcat/share/xcat/install/ubuntu/compute.${LINUX_DISTRO}.${LINUX_ARCH}.pkglist
pkglist=/opt/xcat/share/xcat/install/ubuntu/cudafull.${LINUX_DISTRO}.${LINUX_ARCH}.pkglist
profile=compute
provmethod=install
template=/opt/xcat/share/xcat/install/ubuntu/compute.tmpl
EOF
[ "$?" -ne "0" ] && echo "Make node definition failed." >&2 && exit 1
[ "$?" -ne "0" ] && echo "Make osimage definition failed." >&2 && exit 1
rm -rf "${OSIMAGE_OTHERPKGDIR}"
mkdir -p "${OSIMAGE_OTHERPKGDIR}"
@ -164,7 +164,7 @@ sleep 5
xdsh "${COMPUTE_NODE}" date
[ "$?" -ne "0" ] && echo "Failed connect to compute node via SSH." >&2 && exit 1
xdsh "${COMPUTE_NODE}" 'rpm -q cuda' | grep ': cuda-'
xdsh "${COMPUTE_NODE}" 'dpkg -l' | grep 'cuda-'
[ "$?" -ne "0" ] && echo "CUDA installation checking failed" >&2 && exit 1
exit 0

4
xCAT-test/autotest/testcase/cuda/ubuntu-cuda-diskless-install.sh
View File

@ -137,7 +137,7 @@ ${OSIMAGE_NAME}:
provmethod=netboot
rootimgdir=${OSIMAGE_ROOTIMGDIR}
EOF
[ "$?" -ne "0" ] && echo "Make node definition failed." >&2 && exit 1
[ "$?" -ne "0" ] && echo "Make osimage definition failed." >&2 && exit 1
rm -rf "${OSIMAGE_OTHERPKGDIR}"
mkdir -p "${OSIMAGE_OTHERPKGDIR}"
@ -176,7 +176,7 @@ sleep 5
xdsh "${COMPUTE_NODE}" date
[ "$?" -ne "0" ] && echo "Failed connect to compute node via SSH." >&2 && exit 1
xdsh "${COMPUTE_NODE}" 'rpm -q cuda' | grep ': cuda-'
xdsh "${COMPUTE_NODE}" 'dpkg -l' | grep 'cuda-'
[ "$?" -ne "0" ] && echo "CUDA installation checking failed" >&2 && exit 1
exit 0