fix setting of BUILD_TYPE and BRANCH params

Signed-off-by: Jakub Sokołowski <jakub@status.im>

.gitignore

@@ -163,3 +163,6 @@ logger_settings.ini
 conan*.txt
 conanbuildinfo.*
 conan.cmake
+
+# Env
+.env.bkp

ci/jenkins.groovy

@@ -28,28 +28,29 @@ def abortPreviousRunningBuilds() {
   }
 }
 
+def strParam(key, value) {
+  /* just a helper for making string params */
+  return [
+    name: key,
+    value: value,
+    $class: 'StringParameterValue',
+  ]
+}
+
 def Build(name = null) {
   /**
    * Generate parameters to pass from current params
    * This allows utils.updateEnv() to work in sub-jobs
    **/
   parameters = params.keySet().collectEntries { key ->
-      [(key): [
+      [(key): strParam(key, params.get(key))]
-        name: key,
-        value: params.get(key),
-        $class: 'StringParameterValue'
-      ]]
   }
   /* default to current build type */
-  parameters['BUILD_TYPE'].value = utils.getBuildType()
+  parameters['BUILD_TYPE'] = strParam('BUILD_TYPE', utils.getBuildType())
   /* need to drop origin/ to match definitions of child jobs */
-  parameters['BRANCH'].value = utils.branchName()
+  parameters['BRANCH'] = strParam('BRANCH', utils.branchName())
   /* necessary for updating GitHub PRs */
-  parameters['CHANGE_ID'] = [
+  parameters['CHANGE_ID'] = strParam('CHANGE_ID', env.CHANGE_ID)
-    name: 'CHANGE_ID',
-    value: env.CHANGE_ID,
-    $class: 'StringParameterValue'
-  ]
   /* always pass the BRANCH and BUILD_TYPE params with current branch */
   def b = build(
     job: name,