Implement rp_launch_id parameter to specify launch to be used by the session

Author: Roman Plevka

README.rst

@@ -81,6 +81,7 @@ The following parameters are optional:
 
 - :code:`rp_launch = AnyLaunchName` - launch name (could be overridden
   by pytest --rp-launch option, default value is 'Pytest Launch')
+- :code:`rp_launch_id = xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx` - id of the existing launch (the session will not handle the lifecycle of the given launch)
 - :code:`rp_launch_attributes = 'PyTest' 'Smoke' 'Env:Python3'` - list of attributes for launch
 - :code:`rp_tests_attributes = 'PyTest' 'Smoke'` - list of attributes that will be added for each item in the launch
 - :code:`rp_launch_description = 'Smoke test'` - launch description (could be overridden

pytest_reportportal/plugin.py

@@ -69,7 +69,6 @@ def pytest_sessionstart(session):
     if session.config._reportportal_configured is False:
         # Stop now if the plugin is not properly configured
         return
-
     if is_master(session.config):
         try:
             session.config.py_test_service.init_service(
@@ -78,6 +77,7 @@ def pytest_sessionstart(session):
                 uuid=getenv('RP_UUID') or session.config.getini('rp_uuid'),
                 log_batch_size=int(session.config.getini('rp_log_batch_size')),
                 ignore_errors=bool(session.config.getini('rp_ignore_errors')),
+                custom_launch=session.config.getini('rp_launch_id') or None,
                 ignored_attributes=session.config.getini(
                     'rp_ignore_attributes'),
                 verify_ssl=session.config.getini('rp_verify_ssl'),
@@ -92,13 +92,14 @@ def pytest_sessionstart(session):
 
         attributes = gen_attributes(
             session.config.getini('rp_launch_attributes'))
-        session.config.py_test_service.start_launch(
-            session.config.option.rp_launch,
-            attributes=attributes,
-            description=session.config.option.rp_launch_description
-        )
-        if session.config.pluginmanager.hasplugin('xdist'):
-            wait_launch(session.config.py_test_service.rp)
+        if not session.config.getini('rp_launch_id'):
+            session.config.py_test_service.start_launch(
+                session.config.option.rp_launch,
+                attributes=attributes,
+                description=session.config.option.rp_launch_description
+            )
+            if session.config.pluginmanager.hasplugin('xdist'):
+                wait_launch(session.config.py_test_service.rp)
 
 
 def pytest_collection_finish(session):
@@ -141,7 +142,8 @@ def pytest_sessionfinish(session):
         return
 
     if is_master(session.config):
-        session.config.py_test_service.finish_launch()
+        if not session.config.getini('rp_launch_id'):
+            session.config.py_test_service.finish_launch()
 
 
 def pytest_configure(config):
@@ -241,6 +243,12 @@ def pytest_addoption(parser):
         action='store',
         dest='rp_launch',
         help='Launch name (overrides rp_launch config option)')
+    group.addoption(
+        '--rp-launch-id',
+        action='store',
+        dest='rp_launch_id',
+        help='Use already existing launch-id. The plugin won\'t control the '
+             'Launch status (overrides rp_launch_id config option)')
     group.addoption(
         '--rp-launch-description',
         action='store',
@@ -286,6 +294,12 @@ def pytest_addoption(parser):
         default='Pytest Launch',
         help='Launch name')
 
+    parser.addini(
+        'rp_launch_id',
+        default=None,
+        help='Use already existing launch-id. The plugin won\'t control '
+             'the Launch status')
+
     parser.addini(
         'rp_launch_attributes',
         type='args',

pytest_reportportal/service.py

@@ -141,6 +141,7 @@ def init_service(self,
                      ignore_errors,
                      ignored_attributes,
                      verify_ssl=True,
+                     custom_launch=None,
                      retries=0):
         """Update self.rp with the instance of the ReportPortalService."""
         self._errors = queue.Queue()
@@ -159,7 +160,8 @@ def init_service(self,
                 token=uuid,
                 log_batch_size=log_batch_size,
                 retries=retries,
-                verify_ssl=verify_ssl
+                verify_ssl=verify_ssl,
+                launch_id=custom_launch
             )
             self.project_settings = None
             if self.rp and hasattr(self.rp, "get_project_settings"):