Merge lp:~ubuntu-testcase/ubuntu-community-testing/add_and_package_script into lp:ubuntu-community-testing

[Brendan Donegan]

Do a bit of refactoring of the project layout so the web-service is in its own directory and tools are in a separate one. More importantly, add a script called ubuntu-community-testing which wraps the process of getting the Checkbox provider from people.canonical.com and running Checkbox with it.

This still needs debian packaging for the tools. The debian package should install both tools and the required dependencies (mainly checkbox-converged-community). Once packaged it can be built in the ubuntu-testcase/community-testing PPA

Unmerged revisions

35. By Christopher Lee on 2015-08-21

Update copyright file from where I pilfered it from.

34. By Christopher Lee on 2015-08-21

Add checkbox-converged-community to depends.

33. By Christopher Lee on 2015-08-21

Adding initial packaging w/ slight shuffle around.

32. By Christopher Lee on 2015-08-21

Fix syntax and flake8 errors

31. By Brendan Donegan on 2015-08-20

Add ubuntu-community-testing wrapper script

30. By Brendan Donegan on 2015-08-20

Adding upload script and re-arranging codebase

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2015-08-21 05:49:27 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = true

=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2015-08-21 05:49:27 +0000
@@ -0,0 +1,17 @@
+This project contains too important pieces of the Community Testing Project.
+
+Web Service
+-----------
+Found in ./web-service, this isn't packaged or released as it is consumed using Mojo/Juju and is the server component.
+
+Tools
+-----
+Found in ./ubuntu_community_testing
+These are the user tools for the community testing:
+  - ubuntu_community_testing
+    - This script is used to pull down tests and run them through checkbox
+  - upload_results
+    - This script is used to manually upload results to the web service (generally done by checkbox though).
+
+NOTE: This project relies on the PPA ppa:ubuntu-testcase/community-testing for the checkbox package: checkbox-converged-community.
+  Please install this PPA before installing the ubuntu-community-testing package.

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2015-08-21 05:49:27 +0000
@@ -0,0 +1,5 @@
+ubuntu-community-testing (1.0-1) UNRELEASED; urgency=medium
+
+  * Initial packaging release.
+
+ -- Christopher Lee <[e-mail]>  Mon, 17 Aug 2015 18:27:41 +1200

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2015-08-21 05:49:27 +0000
@@ -0,0 +1,1 @@
+9

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2015-08-21 05:49:27 +0000
@@ -0,0 +1,23 @@
+Source: ubuntu-community-testing
+Section: python
+Priority: optional
+Maintainer: Christopher Lee <[e-mail]>
+Build-Depends: debhelper (>= 9),
+               dh-python,
+               python3-all-dev (>= 3.4),
+               python3-setuptools,
+               python3-flake8,
+Standards-Version: 3.9.5
+Homepage: http://launchpad.net/ubuntu-community-testing
+X-Python3-Version: >= 3.3
+
+Package: ubuntu-community-testing
+Architecture: all
+Depends: ${misc:Depends},
+         ${python3:Depends},
+         python3-requests,
+         python3-oauthlib,
+         python3-urllib3,
+         checkbox-converged-community,
+Description: Tools for operating with the Ubuntu Community Testing.
+ Tools for pushing results and pulling new testsuites with the Ubuntu Community Testing system.
\ No newline at end of file

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2015-08-21 05:49:27 +0000
@@ -0,0 +1,21 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ubuntu-community-testing
+Source: http://launchpad.net/ubuntu-community-testing
+
+Files: *
+Copyright: 2015 Canonical
+License: GPL-3.0
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 3 of the License.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
\ No newline at end of file

=== added file 'debian/docs'
--- debian/docs	1970-01-01 00:00:00 +0000
+++ debian/docs	2015-08-21 05:49:27 +0000
@@ -0,0 +1,1 @@
+README

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2015-08-21 05:49:27 +0000
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+%:
+	dh $@ --with python3 --buildsystem=pybuild
+
+override_dh_auto_build:
+	python3 -m flake8.run tools/
+	dh_auto_build

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2015-08-21 05:49:27 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)

=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2015-08-21 05:49:27 +0000
@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+
+#
+# Ubuntu PractiTest Community
+# Copyright (C) 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import sys
+assert sys.version_info >= (3,), 'Python 3 is required'
+
+from setuptools import setup, find_packages
+
+setup(
+    name='ubuntu-community-testing',
+    version='0.1',
+    description='Gets tests, runs them using Checkbox and uploads the results.',
+    packages=find_packages(),
+    install_requires=[
+        'requests',
+        'oauthlib'
+    ],
+    entry_points={
+        'console_scripts': [
+            ('upload-community-results = '
+             'ubuntu_community_testing.upload_results:main'),
+            ('ubuntu-community-testing = '
+             'ubuntu_community_testing.ubuntu_community_testing:main'),
+        ]
+    }
+)

=== removed directory 'tools'
=== added directory 'ubuntu_community_testing'
=== added file 'ubuntu_community_testing/__init__.py'
--- ubuntu_community_testing/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntu_community_testing/__init__.py	2015-08-21 05:49:27 +0000
@@ -0,0 +1,17 @@
+#
+# Ubuntu Community Testing
+# Copyright (C) 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#

=== added file 'ubuntu_community_testing/ubuntu_community_testing.py'
--- ubuntu_community_testing/ubuntu_community_testing.py	1970-01-01 00:00:00 +0000
+++ ubuntu_community_testing/ubuntu_community_testing.py	2015-08-21 05:49:27 +0000
@@ -0,0 +1,66 @@
+#
+# Ubuntu PractiTest Community test runner
+# Copyright (C) 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""Script to receive tests, run them and upload the results."""
+
+import os
+import sys
+import tempfile
+import urllib.request
+import zipfile
+
+from argparse import ArgumentParser
+from subprocess import check_call, CalledProcessError
+
+TESTSET_LOCATION = ('http://people.canonical.com/'
+                    '~platform-qa/checkbox_providers/')
+
+
+def download_and_extract_testset(filename):
+    url = TESTSET_LOCATION + filename
+    tempdir = tempfile.mkdtemp()
+    r = urllib.request.urlretrieve(url, os.path.join(tempdir, filename))
+    # Now we extract the provider from the zip
+    providerzip = open(r[0], 'rb')
+    z = zipfile.ZipFile(providerzip)
+    for name in z.namelist():
+        z.extract(name, tempdir)
+    return tempdir
+
+
+def main():
+    parser = ArgumentParser(
+        'Receive tests, run them in Checkbox and upload the results.'
+    )
+    parser.add_argument(
+        '--testset',
+        default='current',
+        help='The testset to run'
+    )
+    args = parser.parse_args()
+    providerpath = download_and_extract_testset(args.testset + '.zip')
+    try:
+        check_call(
+            'PROVIDERPATH={} checkbox-touch-community'.format(providerpath),
+            shell=True
+        )
+    except CalledProcessError as err:
+        print(err)
+
+if __name__ == "__main__":
+    sys.exit(main())

=== renamed file 'tools/upload_results.py' => 'ubuntu_community_testing/upload_results.py'
--- tools/upload_results.py	2015-08-18 03:45:23 +0000
+++ ubuntu_community_testing/upload_results.py	2015-08-21 05:49:27 +0000
@@ -21,6 +21,7 @@
 # For example if you're running the runserver.py script:
 # python3 upload_results.py <path to json file> http://localhost:5000/v1/upload
 
+import sys
 import argparse
 import json
 import requests
@@ -140,7 +141,7 @@
     return (args.file, args.url, args.email, args.staging)
 
 
-if __name__ == '__main__':
+def main():
     file_path, url, email, use_staging = get_upload_details()
 
     if use_staging:
@@ -173,3 +174,7 @@
         # Right, now we can post the details.
         requests.post(url, files=upload_data, data=form_data, headers=headers)
         print('Upload succeeded')
+
+
+if __name__ == '__main__':
+    sys.exit(main())

=== added directory 'web-service'
=== renamed file 'README' => 'web-service/README'
=== renamed file 'requirements.txt' => 'web-service/requirements.txt'
=== renamed file 'runserver.py' => 'web-service/runserver.py'
=== renamed file 'setup.py' => 'web-service/setup.py'
=== renamed directory 'ubuntu_pt_community' => 'web-service/ubuntu_pt_community'