mirror of
https://github.com/SAP/jenkins-library.git
synced 2024-12-14 11:03:09 +02:00
Merge branch 'master' into nevskrem-patch-1
This commit is contained in:
commit
2670b4bc2e
@ -4,8 +4,8 @@
|
|||||||
|
|
||||||
## Prerequisites
|
## Prerequisites
|
||||||
|
|
||||||
* Cloud Foundry organization, space and deployment user are available
|
* Cloud Foundry API endpoint, organization, space, user and service instance are available
|
||||||
* Credentials for deployment have been configured in Jenkins with a dedicated Id
|
* Credentials have been configured in Jenkins with a dedicated Id
|
||||||
|
|
||||||
## ${docGenParameters}
|
## ${docGenParameters}
|
||||||
|
|
||||||
@ -19,14 +19,14 @@ The following example creates a service key named "myServiceKey" for the service
|
|||||||
|
|
||||||
```groovy
|
```groovy
|
||||||
cloudFoundryCreateServiceKey(
|
cloudFoundryCreateServiceKey(
|
||||||
script: this,
|
script: this,
|
||||||
cloudFoundry: [
|
cloudFoundry: [
|
||||||
apiEndpoint: 'https://test.server.com',
|
apiEndpoint: 'https://test.server.com',
|
||||||
credentialsId: 'cfCredentialsId',
|
credentialsId: 'cfCredentialsId',
|
||||||
org: 'cfOrg',
|
org: 'cfOrg',
|
||||||
space: 'cfSpace',
|
space: 'cfSpace',
|
||||||
serviceInstance: 'myServiceInstance',
|
serviceInstance: 'myServiceInstance',
|
||||||
serviceKey: 'myServiceKey',
|
serviceKey: 'myServiceKey',
|
||||||
serviceKeyConfig: '{ \"key\" : \"value\" }'
|
serviceKeyConfig: '{ \"key\" : \"value\" }'
|
||||||
])
|
])
|
||||||
```
|
```
|
||||||
|
@ -58,7 +58,7 @@ import static com.sap.piper.Prerequisites.checkScript
|
|||||||
@Field Map CONFIG_KEY_COMPATIBILITY = [cloudFoundry: [apiEndpoint: 'cfApiEndpoint', credentialsId: 'cfCredentialsId', org: 'cfOrg', space: 'cfSpace', serviceInstance: 'cfServiceInstance', serviceKey: 'cfServiceKey', serviceKeyConfig: 'cfServiceKeyConfig']]
|
@Field Map CONFIG_KEY_COMPATIBILITY = [cloudFoundry: [apiEndpoint: 'cfApiEndpoint', credentialsId: 'cfCredentialsId', org: 'cfOrg', space: 'cfSpace', serviceInstance: 'cfServiceInstance', serviceKey: 'cfServiceKey', serviceKeyConfig: 'cfServiceKeyConfig']]
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Step that creates a service key for a service instancve on Cloud Foundry
|
* Step that creates a service key for a specified service instance on Cloud Foundry
|
||||||
*/
|
*/
|
||||||
@GenerateDocumentation
|
@GenerateDocumentation
|
||||||
void call(Map parameters = [:]) {
|
void call(Map parameters = [:]) {
|
||||||
@ -76,6 +76,7 @@ void call(Map parameters = [:]) {
|
|||||||
.withMandatoryProperty('cloudFoundry/credentialsId')
|
.withMandatoryProperty('cloudFoundry/credentialsId')
|
||||||
.withMandatoryProperty('cloudFoundry/serviceInstance')
|
.withMandatoryProperty('cloudFoundry/serviceInstance')
|
||||||
.withMandatoryProperty('cloudFoundry/serviceKey')
|
.withMandatoryProperty('cloudFoundry/serviceKey')
|
||||||
|
.withMandatoryProperty('cloudFoundry/apiEndpoint')
|
||||||
.use()
|
.use()
|
||||||
|
|
||||||
echo "[${STEP_NAME}] Info: docker image: ${config.dockerImage}, docker workspace: ${config.dockerWorkspace}"
|
echo "[${STEP_NAME}] Info: docker image: ${config.dockerImage}, docker workspace: ${config.dockerWorkspace}"
|
||||||
|
Loading…
Reference in New Issue
Block a user