1
0
mirror of https://github.com/SAP/jenkins-library.git synced 2024-12-14 11:03:09 +02:00

docker params as map when creating tr via rfc

This commit is contained in:
Marcus Holl 2019-02-12 15:32:48 +01:00
parent dc1dfd622c
commit 0ae673c021
3 changed files with 6 additions and 10 deletions

View File

@ -102,8 +102,7 @@ public class ChangeManagement implements Serializable {
} }
String createTransportRequestRFC( String createTransportRequestRFC(
String dockerImage, Map docker,
List dockerOptions,
String endpoint, String endpoint,
String developmentClient, String developmentClient,
String developmentInstance, String developmentInstance,
@ -121,7 +120,7 @@ public class ChangeManagement implements Serializable {
def transportRequestId = executeWithCredentials( def transportRequestId = executeWithCredentials(
BackendType.RFC, BackendType.RFC,
[image: dockerImage, options: dockerOptions], docker,
endpoint, endpoint,
credentialsId, credentialsId,
command, command,

View File

@ -177,8 +177,7 @@ public void testGetCommandLineWithCMClientOpts() {
script.setReturnValue('cts createTransportRequest', '{"REQUESTID":"XYZK9000004"}') script.setReturnValue('cts createTransportRequest', '{"REQUESTID":"XYZK9000004"}')
def transportRequestId = new ChangeManagement(nullScript).createTransportRequestRFC( def transportRequestId = new ChangeManagement(nullScript).createTransportRequestRFC(
'rfc', // docker image [image: 'rfc', options: []],
[], // docker options
'https://example.org/rfc', // endpoint 'https://example.org/rfc', // endpoint
'01', // client '01', // client
'001', // instance '001', // instance
@ -211,8 +210,7 @@ public void testGetCommandLineWithCMClientOpts() {
{ throw new AbortException('script returned exit code 3')}) { throw new AbortException('script returned exit code 3')})
def transportRequestId = new ChangeManagement(nullScript).createTransportRequestRFC( def transportRequestId = new ChangeManagement(nullScript).createTransportRequestRFC(
'rfc', // docker image [image: 'rfc', options: []],
[], // docker options
'https://example.org/rfc', // endpoint 'https://example.org/rfc', // endpoint
'01', // client '01', // client
'001', // instance '001', // instance

View File

@ -108,10 +108,9 @@ void call(parameters = [:]) {
configuration.changeManagement.clientOpts) configuration.changeManagement.clientOpts)
} else if (backendType == BackendType.RFC) { } else if (backendType == BackendType.RFC) {
transportRequestId = cm.createTransportRequestRFC( transportRequestId = cm.createTransportRequestRFC(
configuration.changeManagement.rfc.dockerImage, configuration.changeManagement.rfc.docker,
configuration.changeManagement.rfc.dockerOptions ?: [],
configuration.changeManagement.endpoint, configuration.changeManagement.endpoint,
onfiguration.changeManagement.rfc.developmentInstance, configuration.changeManagement.rfc.developmentInstance,
configuration.changeManagement.rfc.developmenClient, configuration.changeManagement.rfc.developmenClient,
configuration.changeManagement.credentialsId, configuration.changeManagement.credentialsId,
configuration.description) configuration.description)