Support for Ubuntu 18.04

docs/25-batch-shipyard-platform-image-support.md

@@ -44,6 +44,7 @@ SLES is not supported at this time.
 | Publisher             | Offer                        | Sku         | GPU | IB/RDMA | Native Only | Native Convert |
 |-----------------------|------------------------------|-------------|:---:|:-------:|:-----------:|:--------------:|
 | Canonical             | UbuntuServer                 | 16.04-LTS   |  X  |  X (1)  |             |      X (2)     |
+| Canonical             | UbuntuServer                 | 18.04-LTS   |  X  |  X (1)  |             |                |
 | microsoft-azure-batch | ubuntu-server-container      | 16-04-lts   |  X  |         |      X      |                |
 | microsoft-azure-batch | ubuntu-server-container-rdma | 16-04-lts   |  X  |  X (3)  |      X      |                |
 
@@ -56,7 +57,7 @@ SLES is not supported at this time.
 | MicrosoftWindowsServer | WindowsServerSemiAnnual | Datacenter-Core-1803-with-Containers-smalldisk |     |         |      X      |                |
 
 ## Notes
-1. IB/RDMA is only supported for this host OS with a custom image. Please
+1. IB/RDMA is supported for this host OS with a custom image. Please
 see the [packer](../contrib/packer) scripts and consult the
 [custom image guide](63-batch-shipyard-custom-images.md) for information
 on how to create a compliant custom image.

scripts/shipyard_nodeprep.sh

@@ -530,7 +530,6 @@ install_nvidia_software() {
     # remove nouveau
     set +e
     rmmod nouveau
-    set -e
     # purge nouveau off system
     if [ "$DISTRIB_ID" == "ubuntu" ]; then
         apt-get --purge remove xserver-xorg-video-nouveau "xserver-xorg-video-nouveau-hwe-${DISTRIB_RELEASE}"
@@ -540,6 +539,7 @@ install_nvidia_software() {
         log ERROR "unsupported distribution for nvidia/GPU: $DISTRIB_ID $DISTRIB_RELEASE"
         exit 1
     fi
+    set -e
     # blacklist nouveau from being loaded if rebooted
     if [ "$DISTRIB_ID" == "ubuntu" ]; then
 cat > /etc/modprobe.d/blacklist-nouveau.conf << EOF
@@ -605,10 +605,10 @@ EOF
     # install nvidia-docker
     if [ "$DISTRIB_ID" == "ubuntu" ]; then
         add_repo https://nvidia.github.io/nvidia-docker/gpgkey
-        curl -fSsL "https://nvidia.github.io/nvidia-docker/ubuntu${DISTRIB_RELEASE}/amd64/nvidia-docker.list" | \
+        curl -fSsL "https://nvidia.github.io/nvidia-docker/ubuntu${DISTRIB_RELEASE}/nvidia-docker.list" | \
             tee /etc/apt/sources.list.d/nvidia-docker.list
     elif [[ $DISTRIB_ID == centos* ]]; then
-        add_repo "https://nvidia.github.io/nvidia-docker/centos${DISTRIB_RELEASE}/x86_64/nvidia-docker.repo"
+        add_repo "https://nvidia.github.io/nvidia-docker/centos${DISTRIB_RELEASE}/nvidia-docker.repo"
     fi
     refresh_package_index
     if [ "$DISTRIB_ID" == "ubuntu" ]; then