implement exportvariable filter

scripts/bot-build.slurm

@@ -10,6 +10,7 @@
 #
 # author: Kenneth Hoste (@boegel)
 # author: Thomas Roeblitz (@trz42)
+# author: Sam Moors (@smoors)
 #
 # license: GPLv2
 #
@@ -23,6 +24,14 @@
 #    for example, repos.cfg and configuration file bundles for repositories
 
 echo "Starting bot-build.slurm"
+EXPORT_VARS_SCRIPT=bot/export_vars.sh
+if [ -f ${EXPORT_VARS_SCRIPT} ]; then
+    echo "${EXPORT_VARS_SCRIPT} script found in '${PWD}', so sourcing it!"
+    source ${EXPORT_VARS_SCRIPT}
+else
+    echo "could not find ${EXPORT_VARS_SCRIPT} script in '${PWD}', skipping" >&2
+fi
+echo "$EXPORT_VARS_SCRIPT finished"
 BOT_BUILD_SCRIPT=bot/build.sh
 if [ -f ${BOT_BUILD_SCRIPT} ]; then
     echo "${BOT_BUILD_SCRIPT} script found in '${PWD}', so running it!"

tasks/build.py

@@ -46,6 +46,8 @@
 _ERROR_GIT_CLONE = "curl"
 _ERROR_NONE = "none"
 
+# other constants
+EXPORT_VARS_FILE = 'export_vars.sh'
 
 Job = namedtuple('Job', ('working_dir', 'arch_target', 'repo_id', 'slurm_opts', 'year_month', 'pr_id', 'accelerator'))
 
@@ -463,6 +465,29 @@ def apply_cvmfs_customizations(cvmfs_customizations, arch_job_dir):
             #      for now, only existing mappings may be customized
 
 
+def prepare_export_vars_file(job_dir, exportvars):
+    """
+    Set up EXPORT_VARS_FILE in directory <job_dir>/bot. This file will be
+    sourced before running the bot/build.sh script.
+
+    Args:
+        job_dir (string): working directory of the job
+        exportvars (list): strings of the form VAR=VALUE to be exported
+
+    Returns:
+        None (implicitly)
+    """
+    fn = sys._getframe().f_code.co_name
+
+    content = '\n'.join(f'export {x}' for x in exportvars)
+    export_vars_path = os.path.join(job_dir, 'bot', EXPORT_VARS_FILE)
+
+    with open(export_vars_path, 'w') as file:
+        file.write(content)
+
+    log(f"{fn}(): created exported variables file {export_vars_path}")
+
+
 def prepare_jobs(pr, cfg, event_info, action_filter):
     """
     Prepare all jobs whose context matches the given filter. Preparation includes
@@ -510,6 +535,9 @@ def prepare_jobs(pr, cfg, event_info, action_filter):
         log(f"{fn}(): found no accelerator requirement")
         accelerator = None
 
+    # determine exportvars from action_filter argument
+    exportvars = action_filter.get_filter_by_component(tools_filter.FILTER_COMPONENT_EXPORT)
+
     jobs = []
     for arch, slurm_opt in arch_map.items():
         arch_dir = arch.replace('/', '_')
@@ -564,6 +592,9 @@ def prepare_jobs(pr, cfg, event_info, action_filter):
 
             prepare_job_cfg(job_dir, build_env_cfg, repocfg, repo_id, cpu_target, os_type, accelerator)
 
+            if exportvars:
+                prepare_export_vars_file(job_dir, exportvars)
+
             # enlist jobs to proceed
             job = Job(job_dir, arch, repo_id, slurm_opt, year_month, pr_id, accelerator)
             jobs.append(job)

tools/filter.py

@@ -20,16 +20,18 @@
 # (none yet)
 
 
-# NOTE because one can use any prefix of one of the four components below to
+# NOTE because one can use any prefix of one of the components below to
 # define a filter, we need to make sure that no two filters share the same
 # prefix OR we have to change the handling of filters.
 FILTER_COMPONENT_ACCEL = 'accelerator'
 FILTER_COMPONENT_ARCH = 'architecture'
+FILTER_COMPONENT_EXPORT = 'exportvariable'
 FILTER_COMPONENT_INST = 'instance'
 FILTER_COMPONENT_JOB = 'job'
 FILTER_COMPONENT_REPO = 'repository'
 FILTER_COMPONENTS = [FILTER_COMPONENT_ACCEL,
                      FILTER_COMPONENT_ARCH,
+                     FILTER_COMPONENT_EXPORT,
                      FILTER_COMPONENT_INST,
                      FILTER_COMPONENT_JOB,
                      FILTER_COMPONENT_REPO