Merge pull request #2899 from alicevision/dev/submitterEnv

[submitter] minor updates to environment variables and user selection

Author: fabiencastan

meshroom/submitters/simpleFarmSubmitter.py

@@ -63,6 +63,12 @@ def __init__(self, parent=None):
         if 'REZ_PROD_PACKAGES_PATH' in os.environ:
             self.environment['REZ_PROD_PACKAGES_PATH'] = os.environ['REZ_PROD_PACKAGES_PATH']
 
+        if 'PROD' in os.environ:
+            self.environment['PROD'] = os.environ['PROD']
+
+        if 'PROD_ROOT' in os.environ:
+            self.environment['PROD_ROOT'] = os.environ['PROD_ROOT']
+
     def createTask(self, meshroomFile, node):
         tags = self.DEFAULT_TAGS.copy()  # copy to not modify default tags
         nbFrames = node.size
@@ -112,7 +118,7 @@ def submit(self, nodes, edges, filepath, submitLabel="{projectName}"):
                 tags=mainTags,
                 requirements={'service': str(','.join(allRequirements))},
                 environment=self.environment,
-                user=os.environ.get('USER', os.environ.get('FARM_USER', getpass.getuser())),
+                user=os.environ.get('FARM_USER', os.environ.get('USER', getpass.getuser())),
                 )
 
         nodeNameToTask = {}