preparation for args substitution

Author: vladak

docker/sync.yml

@@ -9,10 +9,13 @@ commands:
       text: resync + reindex in progress
 - command: [opengrok-mirror, -c, '/opengrok/etc/mirror.yml', -I, -U, '%URL%', '%PROJECT%']
 - command: [opengrok-reindex-project, --printoutput,
+    --api_timeout, '%API_TIMEOUT',
     --jar, /opengrok/lib/opengrok.jar, -U, '%URL%', -P, '%PROJECT%', --,
+    --connectTimeout, '%API_TIMEOUT',
     -r, dirbased, -G, -m, '256', --leadingWildCards, 'on',
     -c, /usr/local/bin/ctags, -U, '%URL%', -H, '%PROJECT%']
   limits: {RLIMIT_NOFILE: 1024}
+  args_subst: {"%API_TIMEOUT%": $API_TIMEOUT}
 - call:
     uri: '%URL%api/v1/messages?tag=%PROJECT%'
     method: DELETE

tools/src/main/python/opengrok_tools/utils/commandsequence.py

@@ -148,7 +148,7 @@ class CommandSequenceBase:
 
     def __init__(self, name, commands, loglevel=logging.INFO, cleanup=None,
                  driveon=False, url=None, env=None, http_headers=None,
-                 api_timeout=None, async_api_timeout=None):
+                 api_timeout=None, async_api_timeout=None, args_subst={}):
         self.name = name
 
         if commands is None:
@@ -179,6 +179,10 @@ def __init__(self, name, commands, loglevel=logging.INFO, cleanup=None,
 
         self.url = url
 
+        self.args_subst = {PROJECT_SUBST: self.name,
+                           URL_SUBST: self.url}
+        self.args_subst.extend(args_subst)
+
     def __str__(self):
         return str(self.name)
 
@@ -263,8 +267,7 @@ def run(self):
                                   env_vars=command.get("env"),
                                   logger=self.logger,
                                   resource_limits=command.get("limits"),
-                                  args_subst={PROJECT_SUBST: self.name,
-                                              URL_SUBST: self.url},
+                                  args_subst=self.args_subst,
                                   args_append=[self.name], excl_subst=True)
                 ret_code = self.run_command(command)