Merge lp:~vila/uci-engine/tr-runs-as-ubuntu into lp:uci-engine

[Vincent Ladeuil]

Run the test worker as ubuntu/ubuntu into ~ubuntu

I realized recently that the test runner was running with the code directory as it's current working directory, ugh.

So I went on more mile and also change the uid/gid in addition to the working directory. Tests are still happy, so am I ;)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Evan (ev)]

Looks okay. Just one minor comment.

review: Approve

[lp:~vila/uci-engine/tr-runs-as-ubuntu]

919. By Vincent Ladeuil on 2014-11-04

Fallback to /tmp if $HOME is not set.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Vincent Ladeuil (vila)]

Grrr, can't get my head around saving the comment to save the inline replies.

Anyway, fixed as suggested ;)

[Joe Talbott (joetalbott)]

On Tue, Nov 04, 2014 at 02:49:08PM -0000, Evan Dandrea wrote:
> > + # We're started in the charm code directory, let's go to a safer place
> > + os.chdir(os.environ['HOME'])
>
> This would probably be safer:
>
> os.environ.get('HOME') or '/tmp'

or

os.environ.get('HOME', '/tmp')

:)

Joe

=== modified file 'juju-deployer/test-runner.yaml.tmpl'
--- juju-deployer/test-runner.yaml.tmpl	2014-10-15 07:18:33 +0000
+++ juju-deployer/test-runner.yaml.tmpl	2014-11-04 15:17:07 +0000
@@ -10,7 +10,8 @@
                 available_code: ${CI_PAYLOAD_URL}
                 packages: "python-requests python-novaclient python-swiftclient python-glanceclient python-uci-vms autopkgtest haveged python-subunit python-testtools python-lazr.enum python-kombu"
                 unit-config: include-base64://configs/unit_config.yaml
-                uid: root
+                uid: ubuntu
+                gid: ubuntu
                 install_sources: |
                     - ${CI_PPA}
                     - "cloud:precise-icehouse"

=== modified file 'test_runner/tstrun/run_worker.py'
--- test_runner/tstrun/run_worker.py	2014-10-30 20:32:22 +0000
+++ test_runner/tstrun/run_worker.py	2014-11-04 15:17:07 +0000
@@ -353,4 +353,10 @@
 if __name__ == '__main__':
     logging.basicConfig(level=logging.INFO,
                         format="%(asctime)s %(levelname)s %(message)s")
+    # We're started in the charm code directory, let's go to a safer place
+    home = os.environ.get('HOME', None)
+    if home is None:
+        logging.warning('$HOME not set ! Going to /tmp')
+        home = '/tmp'
+    os.chdir(home)
     TestRunnerWorker().main(amqp_utils.TEST_RUNNER_QUEUE)