Merge ~sylvain-pineau/checkbox-ng:add_env_PERL5LIB into checkbox-ng:master

[Sylvain Pineau]

On interim release, standard perl modules are loaded from host, which fails:

Can't load '/usr/lib/x86_64-linux-gnu/perl-base/auto/Cwd/Cwd.so' for module Cwd: /snap/core20/current/lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.33' not found (required by /usr/lib/x86_64-linux-gnu/perl-base/auto/Cwd/Cwd.so) at /usr/lib/x86_64-linux-gnu/perl-base/XSLoader.pm line 93.
 at /usr/lib/x86_64-linux-gnu/perl-base/Cwd.pm line 80.
Compilation failed in require at /tmp/nest-fklulusb.fb0c9a20efff53557c9692007fb7b11f9f15c36c4338d445a9b11875f6e0fb9c/inxi_snapshot line 22.
BEGIN failed--compilation aborted at /tmp/nest-fklulusb.fb0c9a20efff53557c9692007fb7b11f9f15c36c4338d445a9b11875f6e0fb9c/inxi_snapshot line 22.

Inxi related jobs (e.g raw_devices_dmi) running as root cannot load the right perl modules if PERL5LIB set in wrapper_common* is not passed to the target environment. This MR fixes it.

[Sylvain Pineau (sylvain-pineau)]

inxi was one example, better to land this little patch to avoid similar import errors even on lts.

review: Approve

diff --git a/plainbox/impl/execution.py b/plainbox/impl/execution.py
index 7d5e5fe..e1aa65b 100644
--- a/plainbox/impl/execution.py
+++ b/plainbox/impl/execution.py
@@ -453,7 +453,7 @@ def get_execution_environment(job, environ, session_id, nest_dir):
                 job.provider.locale_dir
         if (os.getenv("SNAP") or os.getenv("SNAP_APP_PATH")):
             copy_vars = ['PYTHONHOME', 'PYTHONUSERBASE', 'LD_LIBRARY_PATH',
-                         'GI_TYPELIB_PATH']
+                         'GI_TYPELIB_PATH', 'PERL5LIB']
             for key, value in env.items():
                 if key in copy_vars or key.startswith('SNAP'):
                     env[key] = value
@@ -537,7 +537,8 @@ def get_differential_execution_environment(job, environ, session_id, nest_dir,
     # Preserve the copy_vars variables + those prefixed with SNAP on Snappy
     if (os.getenv("SNAP") or os.getenv("SNAP_APP_PATH")):
         copy_vars = ['PYTHONHOME', 'PYTHONUSERBASE', 'LD_LIBRARY_PATH',
-                     'GI_TYPELIB_PATH', 'PROVIDERPATH', 'PYTHONPATH']
+                     'GI_TYPELIB_PATH', 'PROVIDERPATH', 'PYTHONPATH',
+                     'PERL5LIB']
         for key, value in base_env.items():
             if key in copy_vars or key.startswith('SNAP'):
                 delta_env[key] = value