Make envFromProperty reusable

* Eliminate statically hardcoding environment variables such as
  tarballnum
* DEVELOPMENT_BRANCH is not used / maintained anymore, so should be
  dropped.

Author: cvicentiu

master-libvirt/master.cfg

@@ -70,6 +70,8 @@ INSTALL_UPGRADE_PROPERTIES_LIST = [
     # and finally removed from here.
     # Always set to "yes" within this file.
     "systemdCapability",
+    # Set by tarball docker.
+    "tarbuildnum",
     # "server", "all", "columnstore", "deps"
     # Impacts which tests are run. Set within this file only.
     "test_mode",

utils.py

@@ -36,12 +36,10 @@
 exec(open("/srv/buildbot/master/master-private.cfg").read(), private_config, {})
 
 
-def envFromProperties(envlist: list[str]) -> dict[str, str]:
+def envFromProperties(properties: list[str]) -> dict[str, str]:
     d = {}
-    for e in envlist:
-        d[e] = util.Interpolate(f"%(prop:{e})s")
-    d["tarbuildnum"] = util.Interpolate("%(prop:tarbuildnum)s")
-    d["development_branch"] = DEVELOPMENT_BRANCH
+    for prop_name in properties:
+        d[prop_name] = util.Interpolate(f"%(prop:{prop_name})s")
     return d