1
0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-02-07 13:42:23 +02:00

DevelopmentInstance for upload file rfc

This commit is contained in:
Marcus Holl 2019-02-07 11:46:45 +01:00
parent 3a982a8f04
commit 8d1786fa8d
4 changed files with 28 additions and 11 deletions

View File

@ -164,6 +164,7 @@ public class TransportRequestReleaseTest extends BasePiperTest {
List dockerOptions,
String transportRequestId,
String endpoint,
String developmentInstance,
String developmentClient,
String credentialsId) {
@ -172,6 +173,7 @@ public class TransportRequestReleaseTest extends BasePiperTest {
dockerOptions: dockerOptions,
transportRequestId: transportRequestId,
endpoint: endpoint,
developmentInstance: developmentInstance,
developmentClient: developmentClient,
credentialsId: credentialsId,
]
@ -181,7 +183,12 @@ public class TransportRequestReleaseTest extends BasePiperTest {
stepRule.step.transportRequestRelease(
script: nullScript,
transportRequestId: '002',
changeManagement: [rfc: [developmentClient: '003']],
changeManagement: [
rfc: [
developmentClient: '003',
developmentInstance: '002',
]
],
cmUtils: cm)
assert receivedParameters == [
@ -189,6 +196,7 @@ public class TransportRequestReleaseTest extends BasePiperTest {
dockerOptions: [],
transportRequestId: '002',
endpoint: 'https://example.org/rfc',
developmentInstance: '002',
developmentClient: '003',
credentialsId: 'CM',
]
@ -263,6 +271,7 @@ public class TransportRequestReleaseTest extends BasePiperTest {
List dockerOptions,
String transportRequestId,
String endpoint,
String developmentInstance,
String developmentClient,
String credentialsId) {
@ -273,7 +282,12 @@ public class TransportRequestReleaseTest extends BasePiperTest {
stepRule.step.transportRequestRelease(
script: nullScript,
transportRequestId: '002',
changeManagement: [rfc: [developmentClient: '003']],
changeManagement: [
rfc: [
developmentClient: '003',
developmentInstance: '002'
]
],
cmUtils: cm)
}

View File

@ -257,8 +257,11 @@ public class TransportRequestUploadFileTest extends BasePiperTest {
transportRequestId: '123456',
changeManagement: [
type: 'RFC',
rfc: [developmentClient: '002']],
developmentInstance:'001',
rfc: [
developmentClient: '002',
developmentInstance: '001'
]
],
applicationName: '42',
applicationDescription: 'Lorem ipsum',
abapPackage: 'XYZ',
@ -309,10 +312,11 @@ public class TransportRequestUploadFileTest extends BasePiperTest {
transportRequestId: '123456',
changeManagement: [
type: 'RFC',
rfc: [developmentClient: '002']
rfc: [
developmentClient: '002',
developmentInstance: '001',
]
],
developmentInstance:'001',
developmentClient: '002',
applicationName: '42',
applicationDescription: 'Lorem ipsum',
abapPackage: 'XYZ',

View File

@ -56,7 +56,7 @@ void call(parameters = [:]) {
.withMandatoryProperty('changeManagement/git/to')
.withMandatoryProperty('changeManagement/git/from')
.withMandatoryProperty('changeManagement/git/format')
.withMandatoryProperty('changeManagement/rfc/developmetInstance', null, { backendType == BackendType.RFC})
.withMandatoryProperty('changeManagement/rfc/developmentInstance', null, { backendType == BackendType.RFC})
.withMandatoryProperty('changeManagement/rfc/developmentClient', null, { backendType == BackendType.RFC})
configuration = configHelper.use()

View File

@ -23,7 +23,6 @@ import static com.sap.piper.cm.StepHelpers.getBackendTypeAndLogInfoIfCMIntegrati
@Field Set STEP_CONFIG_KEYS = GENERAL_CONFIG_KEYS.plus([
'applicationName', // RFC
'applicationId', // SOLMAN
'developmentInstance',
'applicationDescription',
'abapPackage',
])
@ -67,7 +66,7 @@ void call(parameters = [:]) {
.withMandatoryProperty('changeManagement/git/format')
.withMandatoryProperty('filePath', null, { backendType in [BackendType.SOLMAN, BackendType.CTS] })
.withMandatoryProperty('applicationUrl', null, { backendType == BackendType.RFC })
.withMandatoryProperty('developmentInstance', null, { backendType == BackendType.RFC })
.withMandatoryProperty('changeManagement/rfc/developmentInstance', null, { backendType == BackendType.RFC })
.withMandatoryProperty('changeManagement/rfc/developmentClient', null, { backendType == BackendType.RFC })
.withMandatoryProperty('applicationDescription', null, { backendType == BackendType.RFC })
.withMandatoryProperty('abapPackage', null, { backendType == BackendType.RFC })
@ -145,7 +144,7 @@ void call(parameters = [:]) {
configuration.applicationUrl,
configuration.changeManagement.endpoint,
configuration.changeManagement.credentialsId,
configuration.developmentInstance,
configuration.changeManagement.rfc.developmentInstance,
configuration.changeManagement.rfc.developmentClient,
configuration.applicationDescription,
configuration.abapPackage)