Merge ~bladernr/checkbox-provider-gpgpu:initial-work into checkbox-provider-gpgpu:master

[Jeff Lane ]

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

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

[Sylvain Pineau (sylvain-pineau)]

+1

review: Approve

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index f346706..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,8 +0,0 @@
-# see git-dpm(1) from git-dpm package
-0d8940e7916532866298e1b7506503206d30b456
-0d8940e7916532866298e1b7506503206d30b456
-0d8940e7916532866298e1b7506503206d30b456
-0d8940e7916532866298e1b7506503206d30b456
-plainbox-provider-ipdt_0.4.0.orig.tar.gz
-931f6493f5a736bd44ac4ad11ee1537486d116ba
-4923419
diff --git a/debian/changelog b/debian/changelog
index a46e8bf..81b21b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-checkbox-provider-gpgpu (0.1-0) bionic; urgency=medium
+checkbox-provider-gpgpu (0.1-2) UNRELEASED; urgency=medium
+
+  * Moved the GPGPU launcher, testplan and other stuff in from
+    canonical-certification-server and plainbox-provider-checkbox
+
+ -- Jeff Lane <[e-mail]>  Thu, 21 May 2020 11:47:03 -0400
+
+checkbox-provider-gpgpu (0.1-1) bionic; urgency=medium
 
   * Initial release
   * Added in existing GPGPU setup script and test cases from PPC and PPCS
diff --git a/debian/checkbox-provider-gpgpu.install b/debian/checkbox-provider-gpgpu.install
index bfcf3e2..51e2cb6 100644
--- a/debian/checkbox-provider-gpgpu.install
+++ b/debian/checkbox-provider-gpgpu.install
@@ -1 +1,4 @@
-tools/gpu-setup.sh /usr/bin/
+debian/tmp/usr/share/checkbox-provider-gpgpu/*
+debian/tmp/usr/share/plainbox-providers-1/*.provider
+usr/bin/test-gpgpu
+tools/gpu-setup /usr/bin/
diff --git a/debian/control b/debian/control
index df64703..abb9ec7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,38 +3,27 @@ Section: utils
 Priority: optional
 Maintainer: Checkbox Developers <[e-mail]>
 Uploaders: Jeff Lane <[e-mail]>
-Build-Depends: autoconf,
-               automake,
+Build-Depends: checkbox-ng,
                debhelper (>= 9),
                intltool,
-               libnl-3-dev,
-               libnl-genl-3-dev,
                pkg-config,
                plainbox-provider-checkbox (>= 0.31),
                python3,
                python3-checkbox-ng,
-               python3-debian
+               python3-debian,
+               python3-setuptools
 Standards-Version: 3.9.6
 Homepage: https://launchpad.net/checkbox-provider-gpgpu
 
 Package: checkbox-provider-gpgpu
 Architecture: all
-Depends: apt-file,
-         autoconf,
-         build-essential,
-         cmake,
-         cmake-data,
-         curl,
-         git-core,
-         libcurl4-openssl-dev,
-         libgmp3-dev,
-         libssl-dev,
-         libvulkan-dev,
-         mesa-utils,
-         ocl-icd-libopencl1,
-         opencl-headers,
-         python3,
-         ${misc:Depends},
-         ${plainbox:Depends}
+Depends: plainbox-provider-checkbox (>= 0.27~), ${plainbox:Depends}, ${misc:Depends}
 X-Plainbox-Provider: yes
 Description: Checkbox provider for GPGPU testing
+ This package provides a test plan and tooling to be used by Canonical for the
+ testing and certification of GPGPU devices in "server" computer systems
+ .
+ This provider depends heavily on the installation of the latest nVidia drivers
+ and the CUDA tool kit from nVidia, as well as testing software hosted on
+ github.
+
diff --git a/debian/rules b/debian/rules
index 2ebd61e..6c2c6cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,12 +11,12 @@ override_dh_auto_build:
 	python3 manage.py i18n --dont-update-pot --dont-merge-po
 
 override_dh_auto_test:
-	python3 manage.py validate --loose --legacy
+	#python3 manage.py validate --loose --legacy
 
 override_dh_auto_install:
 	python3 manage.py install \
 		--prefix=/usr --layout=unix \
-		--root=$(CURDIR)/debian/plainbox-provider-ipdt/
+		--root=$(CURDIR)/debian/tmp/
 
 override_dh_gencontrol:
 	python3 manage.py packaging
diff --git a/launcher/test-gpgpu b/launcher/test-gpgpu
new file mode 100755
index 0000000..4669bf0
--- /dev/null
+++ b/launcher/test-gpgpu
@@ -0,0 +1,19 @@
+#!/usr/bin/env checkbox-cli
+
+[launcher]
+app_id = com.canonical.certification:certification-server
+launcher_version = 1
+stock_reports = submission_files, certification
+
+[test plan]
+unit = com.canonical.certification::gpgpu-only
+forced = yes
+
+[test selection]
+forced = yes
+
+[ui]
+output = hide-resource-and-attachment
+
+[config]
+config_filename = canonical-certification.conf
diff --git a/tools/gpu-setup.sh b/tools/gpu-setup
similarity index 100%
rename from tools/gpu-setup.sh
rename to tools/gpu-setup
diff --git a/units/gpgpu-only.pxu b/units/gpgpu-only.pxu
new file mode 100644
index 0000000..b92f279
--- /dev/null
+++ b/units/gpgpu-only.pxu
@@ -0,0 +1,15 @@
+id: gpgpu-only
+unit: test plan
+_name: GPGPU Compute Testing
+_description:
+ Tests for GPGPU Computations (non-graphical)
+nested_part:
+    com.canonical.certification::server-info-attachment-automated
+    com.canonical.certification::server-firmware
+    com.canonical.certification::server-miscellaneous
+    com.canonical.certification::gpgpu-tests
+include:
+bootstrap_include:
+    device
+    fwts
+