Merge lp:~kissiel/checkbox/fix-1560198-environ-in-launchers into lp:checkbox

[Maciej Kisielewski]

This MR brings [environment] section to new launchers.

... and configs.

418e747 checkbox-ng:launchers: support [environment] in new launchers
c87d070 checkbox-ng:docs: mention [environment] in the docs

[Sylvain Pineau (sylvain-pineau)]

use_alternate_configuration and PlainBoxConfig, good findings, +1

review: Approve

=== modified file 'checkbox-ng/checkbox_ng/launcher.py'
--- checkbox-ng/checkbox_ng/launcher.py	2016-03-14 21:04:19 +0000
+++ checkbox-ng/checkbox_ng/launcher.py	2016-03-22 16:27:30 +0000
@@ -26,6 +26,7 @@
 import logging
 
 from checkbox_ng.config import SECURE_ID_PATTERN
+from plainbox.impl.applogic import PlainBoxConfig
 from plainbox.impl.secure import config
 from plainbox.impl.session.assistant import get_all_sa_flags
 from plainbox.impl.session.assistant import get_known_sa_api_versions
@@ -35,7 +36,7 @@
 logger = logging.getLogger("checkbox.ng.launcher")
 
 
-class LauncherDefinition(config.Config):
+class LauncherDefinition(PlainBoxConfig):
     """
     Launcher definition.
 
@@ -270,5 +271,8 @@
         name='transport',
         help_text=_('Transport declaration'))
 
+    environment = config.Section(
+        help_text=_('Environment variables to use'))
+
 
 DefaultLauncherDefinition = LauncherDefinition1

=== modified file 'checkbox-ng/docs/launcher-tutorial.rst'
--- checkbox-ng/docs/launcher-tutorial.rst	2016-03-15 11:53:25 +0000
+++ checkbox-ng/docs/launcher-tutorial.rst	2016-03-22 16:27:30 +0000
@@ -186,6 +186,23 @@
 strategies are ``XDG`` and ``Snappy``. By default the best strategy is
 determined in runtime.
 
+Environment section
+===================
+
+``[environment]``
+
+Beginning of the environment section
+
+Each variable present in the ``environment`` section will be present as
+environment variable for all jobs run.
+
+Example:
+
+::
+
+    [environment]
+    TESTING_HOST = 192.168.0.100
+
 
 Generating reports
 ==================

=== modified file 'checkbox-ng/launchers/checkbox-cli'
--- checkbox-ng/launchers/checkbox-cli	2016-03-15 13:42:18 +0000
+++ checkbox-ng/launchers/checkbox-cli	2016-03-22 16:27:30 +0000
@@ -202,6 +202,7 @@
             self.ctx = ctx
             self._configure_restart(ctx)
             self._prepare_transports()
+            ctx.sa.use_alternate_configuration(self.launcher)
             ctx.sa.select_providers(*self.launcher.providers)
             self._maybe_resume_session() or self._start_new_session()
             self._pick_jobs_to_run()