Merge ~bladernr/plainbox-provider-certification-server:1879965-move-GPGPU-to-own-provider into plainbox-provider-certification-server:master

Proposed by Jeff Lane 
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 4291d34ac7f69b291248007dfc76f0bbf8e67b04
Merged at revision: 4bc5a775ea68cddc5803e3e2bf1f8e417e9d0a08
Proposed branch: ~bladernr/plainbox-provider-certification-server:1879965-move-GPGPU-to-own-provider
Merge into: plainbox-provider-certification-server:master
Diff against target: 148 lines (+3/-18)
2 files modified
dev/null (+0/-15)
tools/canonical-certification-precheck (+3/-3)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+384368@code.launchpad.net

Commit message

LP: 1879965 - Moved GPGPU test files into their own provider.

Description of the change

LP: 1879965 - Moved GPGPU test files into their own provider.

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/launcher/test-gpgpu b/launcher/test-gpgpu
0deleted file mode 1007550deleted file mode 100755
index 4669bf0..0000000
--- a/launcher/test-gpgpu
+++ /dev/null
@@ -1,19 +0,0 @@
1#!/usr/bin/env checkbox-cli
2
3[launcher]
4app_id = com.canonical.certification:certification-server
5launcher_version = 1
6stock_reports = submission_files, certification
7
8[test plan]
9unit = com.canonical.certification::gpgpu-only
10forced = yes
11
12[test selection]
13forced = yes
14
15[ui]
16output = hide-resource-and-attachment
17
18[config]
19config_filename = canonical-certification.conf
diff --git a/tools/canonical-certification-precheck b/tools/canonical-certification-precheck
index 210a5b3..c8ba2c4 100755
--- a/tools/canonical-certification-precheck
+++ b/tools/canonical-certification-precheck
@@ -839,9 +839,9 @@ if lspci | grep "3D controller [0302]"; then
839 gpu="GPGPU Detected"839 gpu="GPGPU Detected"
840 echo " $gpu"840 echo " $gpu"
841 echo " In order to test the discovered GPGPU device(s)"841 echo " In order to test the discovered GPGPU device(s)"
842 echo " You will need to run the gpu-setup.sh script "842 echo " You will need to install the checkbox-provider-gpgpu"
843 echo " included with the Server Certification suite to"843 echo " package and run the gpu-setup script to install"
844 echo " install the necessary drivers and toolkit."844 echo " the necessary drivers and toolkit."
845 eval info${i}=\"$gpu\"845 eval info${i}=\"$gpu\"
846 info846 info
847else847else
diff --git a/tools/gpu-setup.sh b/tools/gpu-setup.sh
848deleted file mode 100755848deleted file mode 100755
index 22a8430..0000000
--- a/tools/gpu-setup.sh
+++ /dev/null
@@ -1,79 +0,0 @@
1#!/bin/bash
2
3if [[ $EUID -ne 0 ]]; then
4 echo "ERROR: This script must be run as root"
5 exit 1
6fi
7
8echo "Configuring system for GPU Testing"
9echo "**********************************"
10echo "*"
11
12# For now we need internet access for this to work. Future versions will
13# remove this necessity
14echo "* Testing network connectivity"
15[[ ! `ping -c 1 www.ubuntu.com` ]] \
16 && echo "ERROR: This script requires internet access to function correctly" \
17 && exit 1
18echo "*"
19echo "**********************************"
20echo "*"
21echo "* Adding nVidia package repository"
22## Leave the following bits for now, it's useful code to template if we sort
23## out local hosting in the future.
24#file_pattern="cuda-repo-ubuntu$(lsb_release -r | cut -f 2 | sed -es/\\.//)*.deb"
25#gw_ip=`ip route | awk '/default/ { print $3 }'`
26
27# attempt a download from our MAAS server (presume the SUT's gw IP is MAAS)
28#wget -r -l1 -nd --no-parent -A "$file_pattern" http://$gw_ip/nvidia/
29#nvidia_pkg=`find / -name $file_pattern`
30
31#if [ -z "$nvidia_pkg" ]; then
32# echo "* No local package found, installing remote installer"
33# wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-repo-ubuntu1804_10.0.130-1_amd64.deb
34# dpkg -i cuda-repo-ubuntu1804_10.0.130-1_amd64.deb
35# apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub
36#else
37# echo "* Local package detected at $nvidia_pkg... installing"
38# key_cmd=`dpkg -i $nvidia_pkg |awk '/To install the key, run this command/{getline; print}'`
39# $key_cmd
40#fi
41
42## For now, require internet access and installing directly from nVidia
43# SAUCE: https://developer.nvidia.com/cuda-downloads?target_os=Linux&target_arch=x86_64&target_distro=Ubuntu&target_version=1804&target_type=debnetwork
44
45OSRELEASE=ubuntu`lsb_release -r | cut -f2 |sed -e 's/\.//'`
46
47wget https://developer.download.nvidia.com/compute/cuda/repos/$OSRELEASE/x86_64/cuda-$OSRELEASE.pin
48mv cuda-$OSRELEASE.pin /etc/apt/preferences.d/cuda-repository-pin-600
49# Ran into a case where the 16.04 repo uses http while 18.04 uses https :/
50KEYSERVER_URL_TAIL="://developer.download.nvidia.com/compute/cuda/repos/$OSRELEASE/x86_64/7fa2af80.pub"
51SUCCESS=1
52for KEYSERVER_URL_HEAD in https http; do
53 KEYSERVER_URL=$KEYSERVER_URL_HEAD$KEYSERVER_URL_TAIL
54 apt-key adv --fetch-keys $KEYSERVER_URL
55 SUCCESS=$?
56 [ $SUCCESS == 0 ] && break
57done
58
59add-apt-repository "deb http://developer.download.nvidia.com/compute/cuda/repos/$OSRELEASE/x86_64/ /"
60
61# Install necessary files
62apt update
63echo "* Installing necessary pacakges"
64apt install -y build-essential git cuda
65
66#fix the path to get nvcc from the cuda package
67CUDA_PATH=$(find /usr/local -maxdepth 1 -type d -iname "cuda*")/bin
68export PATH=$PATH:$CUDA_PATH
69
70# get the gpu-burn repo and build it
71echo "* Cloning gpu-burn repo"
72GPU_BURN_DIR=/opt/gpu-burn
73git clone https://github.com/wilicc/gpu-burn.git $GPU_BURN_DIR
74cd $GPU_BURN_DIR
75echo "* Building gpu-burn"
76make && echo "* Build completed..."
77echo "*"
78echo "* Completed installation. Please reboot the machine now"
79echo "* to load the nVidia proprietary drivers"
diff --git a/units/gpgpu-only.pxu b/units/gpgpu-only.pxu
80deleted file mode 1006440deleted file mode 100644
index b92f279..0000000
--- a/units/gpgpu-only.pxu
+++ /dev/null
@@ -1,15 +0,0 @@
1id: gpgpu-only
2unit: test plan
3_name: GPGPU Compute Testing
4_description:
5 Tests for GPGPU Computations (non-graphical)
6nested_part:
7 com.canonical.certification::server-info-attachment-automated
8 com.canonical.certification::server-firmware
9 com.canonical.certification::server-miscellaneous
10 com.canonical.certification::gpgpu-tests
11include:
12bootstrap_include:
13 device
14 fwts
15

Subscribers

People subscribed via source and target branches