From a7f28efb72912b6970055b7b2bd57dd97331c767 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Wed, 21 Mar 2018 14:49:36 +0800
Subject: [PATCH 1/2] Updates for CUDA 9.2 and RHEL 7.5 Alternate

---
 .../cuda/rhel-cuda-diskfull-install.sh        |  7 +++++--
 .../cuda/rhel-cuda-diskless-install.sh        | 21 ++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh
index b5da8d579..9d174d8dd 100755
--- a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh
+++ b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh
@@ -3,11 +3,11 @@
 ########
 # Set all the variables below
 
-LINUX_DISTRO="rhels7.4"
+LINUX_DISTRO="rhels7.5-alternate"
 LINUX_ARCH="ppc64le"
 
 COMPUTE_NODE="c910f03c01p10"
-SOURCE_DIR="/media/xcat"
+SOURCE_DIR="/install/tmp"
 
 ########
 
@@ -57,6 +57,9 @@ do
 	"dkms-"*".el7.noarch.rpm")
 		DKMS_RPM="${r}"
 		;;
+        "nvidia-driver-local-repo-rhel"*"-"*".${LINUX_ARCH}.rpm")
+                CUDA_RPMS+=("${r}")
+                ;;
 	esac
 done
 
diff --git a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh
index 731f324fc..bc97d8757 100755
--- a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh
+++ b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh
@@ -3,11 +3,11 @@
 ########
 # Set all the variables below
 
-LINUX_DISTRO="rhels7.4"
+LINUX_DISTRO="rhels7.5-alternate"
 LINUX_ARCH="ppc64le"
 
 COMPUTE_NODE="c910f03c01p10"
-SOURCE_DIR="/media/xcat"
+SOURCE_DIR="/install/tmp"
 
 ########
 
@@ -57,6 +57,9 @@ do
 	"dkms-"*".el7.noarch.rpm")
 		DKMS_RPM="${r}"
 		;;
+	"nvidia-driver-local-repo-rhel"*"-"*".${LINUX_ARCH}.rpm")
+		CUDA_RPMS+=("${r}")
+		;;
 	esac
 done
 
@@ -123,13 +126,25 @@ ${OSIMAGE_NAME}:
     permission=755
     pkgdir=/install/${LINUX_DISTRO}/${LINUX_ARCH}
     pkglist=/opt/xcat/share/xcat/netboot/rh/compute.${LINUX_DISTRO%%.*}.${LINUX_ARCH}.pkglist
-    postinstall=/opt/xcat/share/xcat/netboot/rh/compute.${LINUX_DISTRO%%.*}.${LINUX_ARCH}.postinstall
+    postinstall=/install/custom/netboot/rh/cudafull.${LINUX_DISTRO%%.*}.${LINUX_ARCH}.postinstall
     profile=compute
     provmethod=netboot
     rootimgdir=${OSIMAGE_ROOTIMGDIR}
 EOF
 [ "$?" -ne "0" ] && echo "Make osimage definition failed." >&2 && exit 1
 
+(
+	cat "/opt/xcat/share/xcat/netboot/rh/compute.${LINUX_DISTRO%%.*}.${LINUX_ARCH}.postinstall"
+	cat <<-EOF
+
+	cp /install/postscripts/cuda_power9_setup "${OSIMAGE_ROOTIMGDIR}/rootimg/tmp/cuda_power9_setup"
+	chroot "${OSIMAGE_ROOTIMGDIR}/rootimg" /tmp/cuda_power9_setup
+
+	rm -f "${OSIMAGE_ROOTIMGDIR}/rootimg/tmp/cuda_power9_setup"
+	EOF
+) >"/install/custom/netboot/rh/cudafull.${LINUX_DISTRO%%.*}.${LINUX_ARCH}.postinstall"
+chmod 0755 "/install/custom/netboot/rh/cudafull.${LINUX_DISTRO%%.*}.${LINUX_ARCH}.postinstall"
+
 rm -rf "${OSIMAGE_OTHERPKGDIR}"
 mkdir -p "${OSIMAGE_OTHERPKGDIR}"
 for f in "${CUDA_RPMS[@]}"

From 4e2d236d6ae08674765a5db9f70daf371d0d24b6 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Thu, 29 Mar 2018 16:05:28 +0800
Subject: [PATCH 2/2] Create directory /install/custom/netboot/rh as needed

---
 xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh | 2 ++
 xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh
index 9d174d8dd..410da181e 100755
--- a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh
+++ b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh
@@ -100,6 +100,8 @@ do
 done
 ########
 
+umask 0022
+
 OSIMAGE_NAME="${LINUX_DISTRO}-${LINUX_ARCH}-install-cudafull"
 OSIMAGE_OTHERPKGDIR="/install/post/otherpkgs/${LINUX_DISTRO}/${LINUX_ARCH}"
 
diff --git a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh
index bc97d8757..e8c9030b2 100755
--- a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh
+++ b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh
@@ -100,6 +100,8 @@ do
 done
 ########
 
+umask 0022
+
 OSIMAGE_NAME="${LINUX_DISTRO}-${LINUX_ARCH}-netboot-cudafull"
 OSIMAGE_OTHERPKGDIR="/install/post/otherpkgs/${LINUX_DISTRO}/${LINUX_ARCH}"
 OSIMAGE_ROOTIMGDIR="/install/netboot/${LINUX_DISTRO}/${LINUX_ARCH}/${OSIMAGE_NAME}"
@@ -133,6 +135,7 @@ ${OSIMAGE_NAME}:
 EOF
 [ "$?" -ne "0" ] && echo "Make osimage definition failed." >&2 && exit 1
 
+mkdir -p "/install/custom/netboot/rh"
 (
 	cat "/opt/xcat/share/xcat/netboot/rh/compute.${LINUX_DISTRO%%.*}.${LINUX_ARCH}.postinstall"
 	cat <<-EOF