From 1e20fbb6a7e73877c7506e2b936c1b23a3be1c6e Mon Sep 17 00:00:00 2001
From: Roland Stengel <r.stengel@sap.com>
Date: Wed, 29 Sep 2021 17:50:45 +0200
Subject: [PATCH] No such property: commonPipelineEnvironment for class:
 com.sap.piper.cm.StepHelpers (#3132)

Fix Issue 3131
---
 src/com/sap/piper/cm/StepHelpers.groovy | 4 ++--
 vars/transportRequestUploadFile.groovy  | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/com/sap/piper/cm/StepHelpers.groovy b/src/com/sap/piper/cm/StepHelpers.groovy
index ce5da9286..60c6dc4d7 100644
--- a/src/com/sap/piper/cm/StepHelpers.groovy
+++ b/src/com/sap/piper/cm/StepHelpers.groovy
@@ -106,7 +106,7 @@ public class StepHelpers {
             "to: ${configuration.changeManagement.git.to}]." +
             "transportRequestLabel: '${configuration.changeManagement.transportRequestLabel}']."
 
-        script.transportRequestReqIDFromGit(script: this,
+        script.transportRequestReqIDFromGit(script: script,
             gitFrom: configuration.changeManagement.git.from,
             gitTo: configuration.changeManagement.git.to,
             transportRequestLabel: configuration.changeManagement.transportRequestLabel
@@ -148,7 +148,7 @@ public class StepHelpers {
             "to: ${configuration.changeManagement.git.to}, " +
             "changeDocumentLabel: '${configuration.changeManagement.changeDocumentLabel}']."
 
-        script.transportRequestDocIDFromGit(script: this,
+        script.transportRequestDocIDFromGit(script: script,
             gitFrom: configuration.changeManagement.git.from,
             gitTo: configuration.changeManagement.git.to,
             changeDocumentLabel: configuration.changeManagement.changeDocumentLabel
diff --git a/vars/transportRequestUploadFile.groovy b/vars/transportRequestUploadFile.groovy
index 8f8c99c36..f2aeea94d 100644
--- a/vars/transportRequestUploadFile.groovy
+++ b/vars/transportRequestUploadFile.groovy
@@ -242,7 +242,6 @@ void call(Map parameters = [:]) {
 
                         Map paramsUpload = [
                             script: script,
-                            cmClientOpts: configuration.changeManagement.clientOpts?: [:],
                             filePath: configuration.filePath,
                             uploadCredentialsId: configuration.changeManagement.credentialsId,
                             endpoint: configuration.changeManagement.endpoint,
@@ -251,6 +250,9 @@ void call(Map parameters = [:]) {
                             transportRequestId: configuration.transportRequestId
                             ]
 
+                        if(configuration.changeManagement.clientOpts) {
+                            paramsUpload.cmClientOpts = configuration.changeManagement.clientOpts
+                        }
                         paramsUpload = addDockerParams(script, paramsUpload, configuration.changeManagement.solman?.docker)
 
                         transportRequestUploadSOLMAN(paramsUpload)