Merge lp:~vila/ubuntu-ci-services-itself/1293625-no-built-binaries into lp:ubuntu-ci-services-itself

[Vincent Ladeuil]

Fix the adt-run call to not build binaries unless required.

Re-digging adt-run and testing locally (yeah throw away vms from uci-vms !)
I found the right combination of options.

I did a few more tests and this combination is still obeying 'Restrictions:
build-needed' and still installing the test deps when needed but don't
rebuild the package.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:414
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~vila/ubuntu-ci-services-itself/1293625-no-built-binaries/+merge/212267/+edit-commit-message

http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/456/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/456/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:414
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/458/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/458/rebuild

review: Approve (continuous-integration)

[Paul Larson (pwlars)]

Makes sense, which packages did you try running this with? Would feel more comfortable knowing it was tried with some package that normally has to be compiled, but doesn't request it in the restrictions to see that 1. it doesn't compile it, and 2. the tests still pass since the binary package is installed. Otherwise, +1

review: Approve

[Vincent Ladeuil (vila)]

> Makes sense, which packages did you try running this with?

libpng

This package requires that *some* test deps are compiled but not the package library itself.

> Would feel more
> comfortable knowing it was tried with some package that normally has to be
> compiled, but doesn't request it in the restrictions to see

'has to be compiled'is a configuration that should not exist. It would mean the package is not testing the installed version which is what dep-8 tests are about.

> that 1. it doesn't
> compile it, and 2. the tests still pass since the binary package is installed.

But *that* is what I tested, test passing despite not compiling the package.

> Otherwise, +1

=== modified file 'TRICKS'
--- TRICKS	2014-03-14 10:49:19 +0000
+++ TRICKS	2014-03-22 00:12:29 +0000
@@ -294,6 +294,8 @@
 - merge branches into the payload,
 - restart the service.
 
+NOTE: Since we use the test runner has an example, some paths need to be
+adjusted for other components. Like-wise, some command outputs may vary.
 
 Turning the payload into a branch
 ---------------------------------
 
=== modified file 'test_runner/run_test.py'
--- test_runner/run_test.py	2014-03-17 18:07:22 +0000
+++ test_runner/run_test.py	2014-03-22 00:12:29 +0000
@@ -48,15 +48,13 @@
         os.mkdir('results')
 
 
-def get_dsc_path(package, cwd):
-    """Returns the '.dsc' path found in the 'apt-get source' files."""
-    # FIXME: It would be better to just use the files from the ticket but: 1)
-    # it requires changing several components API, 2) It's not guaranteed to be
-    # enough. apt-get source *is* guaranteed to be enough. -- vila 2014-03-11
+def get_src_tree_path(pacakge, cwd):
+    """Returns the path where 'apt-get source' did the extraction."""
     files = os.listdir(cwd)
     for f in files:
-        if f.endswith('.dsc'):
-            return os.path.join(cwd, f)
+        path = os.path.join(cwd, f)
+        if os.path.isdir(path):
+            return path
 
 
 def parse_summary_line(line):
@@ -145,12 +143,16 @@
     # MISSINGTEST: Unable to locate package (wrong name or whatever)
     # MISSINGTEST: no deb-src in source.list
     run('apt-get', 'source', package, cwd=package)
-    # MISSINGTEST: dsc file not found
-    dsc_path = get_dsc_path(package, cwd=package)
+    # MISSINGTEST: no dir found
+    src_tree_path = get_src_tree_path(package, cwd=package)
     try:
         summary_path = '{}-summary.log'.format(package)
         log_path = '{}.log'.format(package)
-        cmd = ['sudo', 'adt-run', dsc_path,
+        cmd = ['sudo', 'adt-run',
+               # Restrictions: build-needed will override --no-built-binaries
+               # so it's safe to specify it.
+               '--no-built-binaries',
+               '--unbuilt-tree', src_tree_path,
                '--summary', summary_path,
                '--log-file', log_path,
                # Required to get files produced in 'results'