Merge commit '82fea30fcce1d169de7ec42be84d079e0899519c' into feature/update-dependenies

OpenVPN Adapter/Vendors/openvpn/win/buildep.py

@@ -30,6 +30,9 @@ def build_mbedtls(parms):
             d = expand('mbedtls', parms['DEP'], parms.get('LIB_VERSIONS'))
             if d.endswith("-apache"):
                 d = d[:-7]
+            elif d.endswith("-gpl"):
+                d = d[:-4]
+
             os.rename(d, dist)
 
             # edit mbedTLS config.h
@@ -89,4 +92,10 @@ def build_all(parms):
 
 if __name__ == "__main__":
     from parms import PARMS
+
+    # some parameters might be redefined, like in Jenkins multibranch pipeline case
+    PARMS['BUILD'] = os.environ.get('BUILD', PARMS['BUILD'])
+    PARMS['OVPN3'] = os.environ.get('OVPN3', PARMS['OVPN3'])
+    PARMS['ARCH'] = os.environ.get('ARCH', PARMS['ARCH'])
+
     build_all(PARMS)