jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-09-16 09:26:22 +02:00
Code Issues Releases Activity

use v6 version of ppiper/cf-cli consistently for all go steps (#2569)

Browse Source
This commit is contained in:
Marcus Holl
2021-02-11 09:31:25 +01:00
committed by GitHub
parent f030bc9861
commit c53d5241cb
29 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/abapEnvironmentAssemblePackages_generated.go
View File

@@ -234,7 +234,7 @@ func abapEnvironmentAssemblePackagesMetadata() config.StepData {
},
},
Containers: []config.Container{
{Name: "cf", Image: "ppiper/cf-cli"},
{Name: "cf", Image: "ppiper/cf-cli:6"},
},
Outputs: config.StepOutputs{
Resources: []config.StepResources{

2
cmd/abapEnvironmentCheckoutBranch_generated.go
View File

@@ -221,7 +221,7 @@ func abapEnvironmentCheckoutBranchMetadata() config.StepData {
},
},
Containers: []config.Container{
{Name: "cf", Image: "ppiper/cf-cli"},
{Name: "cf", Image: "ppiper/cf-cli:6"},
},
},
}

2
cmd/abapEnvironmentCloneGitRepo_generated.go
View File

@@ -221,7 +221,7 @@ func abapEnvironmentCloneGitRepoMetadata() config.StepData {
},
},
Containers: []config.Container{
{Name: "cf", Image: "ppiper/cf-cli"},
{Name: "cf", Image: "ppiper/cf-cli:6"},
},
},
}

2
cmd/abapEnvironmentCreateSystem_generated.go
View File

@@ -291,7 +291,7 @@ func abapEnvironmentCreateSystemMetadata() config.StepData {
},
},
Containers: []config.Container{
{Name: "cf", Image: "ppiper/cf-cli:v5"},
{Name: "cf", Image: "ppiper/cf-cli:6"},
},
},
}

2
cmd/abapEnvironmentPullGitRepo_generated.go
View File

@@ -221,7 +221,7 @@ func abapEnvironmentPullGitRepoMetadata() config.StepData {
},
},
Containers: []config.Container{
{Name: "cf", Image: "ppiper/cf-cli"},
{Name: "cf", Image: "ppiper/cf-cli:6"},
},
},
}

2
cmd/abapEnvironmentRunATCCheck_generated.go
View File

@@ -214,7 +214,7 @@ func abapEnvironmentRunATCCheckMetadata() config.StepData {
},
},
Containers: []config.Container{
{Name: "cf", Image: "ppiper/cf-cli"},
{Name: "cf", Image: "ppiper/cf-cli:6"},
},
},
}

2
cmd/cloudFoundryCreateServiceKey_generated.go
View File

@@ -203,7 +203,7 @@ func cloudFoundryCreateServiceKeyMetadata() config.StepData {
},
},
Containers: []config.Container{
{Name: "cf", Image: "ppiper/cf-cli"},
{Name: "cf", Image: "ppiper/cf-cli:6"},
},
},
}

2
cmd/cloudFoundryCreateService_generated.go
View File

@@ -267,7 +267,7 @@ func cloudFoundryCreateServiceMetadata() config.StepData {
},
},
Containers: []config.Container{
{Name: "cf", Image: "ppiper/cf-cli:v5"},
{Name: "cf", Image: "ppiper/cf-cli:6"},
},
},
}

2
cmd/cloudFoundryCreateSpace_generated.go
View File

@@ -161,7 +161,7 @@ func cloudFoundryCreateSpaceMetadata() config.StepData {
},
},
Containers: []config.Container{
{Name: "cf", Image: "ppiper/cf-cli"},
{Name: "cf", Image: "ppiper/cf-cli:6"},
},
},
}

2
cmd/cloudFoundryDeleteService_generated.go
View File

@@ -192,7 +192,7 @@ func cloudFoundryDeleteServiceMetadata() config.StepData {
},
},
Containers: []config.Container{
{Name: "cf", Image: "ppiper/cf-cli", WorkingDir: "/home/piper"},
{Name: "cf", Image: "ppiper/cf-cli:6", WorkingDir: "/home/piper"},
},
},
}

2
cmd/cloudFoundryDeleteSpace_generated.go
View File

@@ -161,7 +161,7 @@ func cloudFoundryDeleteSpaceMetadata() config.StepData {
},
},
Containers: []config.Container{
{Name: "cf", Image: "ppiper/cf-cli"},
{Name: "cf", Image: "ppiper/cf-cli:6"},
},
},
}

2
cmd/cloudFoundryDeploy_generated.go
View File

@@ -473,7 +473,7 @@ func cloudFoundryDeployMetadata() config.StepData {
},
},
Containers: []config.Container{
{Name: "cfDeploy", Image: "ppiper/cf-cli"},
{Name: "cfDeploy", Image: "ppiper/cf-cli:6"},
},
Outputs: config.StepOutputs{
Resources: []config.StepResources{

2
documentation/docs/steps/dockerExecuteOnKubernetes.md
View File

@@ -46,7 +46,7 @@ export ON_K8S=true"
```
```groovy
dockerExecuteOnKubernetes(script: script, containerMap: ['maven:3.5-jdk-8-alpine': 'maven', 'ppiper/cf-cli': 'cfcli']){
dockerExecuteOnKubernetes(script: script, containerMap: ['maven:3.5-jdk-8-alpine': 'maven', 'ppiper/cf-cli:6': 'cfcli']){
container('maven'){
sh "mvn clean install"
}

4
resources/default_pipeline_environment.yml
View File

@@ -211,10 +211,10 @@ steps:
- 'deployDescriptor'
- 'pipelineConfigAndTests'
cf_native:
dockerImage: 'ppiper/cf-cli:v5'
dockerImage: 'ppiper/cf-cli:6'
dockerWorkspace: '/home/piper'
mtaDeployPlugin:
dockerImage: 'ppiper/cf-cli:v5'
dockerImage: 'ppiper/cf-cli:6'
dockerWorkspace: '/home/piper'
mta:
deployTool: 'mtaDeployPlugin'

2
resources/metadata/abapEnvironmentAssemblePackages.yaml
View File

@@ -125,4 +125,4 @@ spec:
- name: abap/addonDescriptor
containers:
- name: cf
image: ppiper/cf-cli
image: ppiper/cf-cli:6

2
resources/metadata/abapEnvironmentCheckoutBranch.yaml
View File

@@ -129,4 +129,4 @@ spec:
- name: cfServiceKeyName
containers:
- name: cf
image: ppiper/cf-cli
image: ppiper/cf-cli:6

2
resources/metadata/abapEnvironmentCloneGitRepo.yaml
View File

@@ -129,4 +129,4 @@ spec:
- name: cfServiceKey
containers:
- name: cf
image: ppiper/cf-cli
image: ppiper/cf-cli:6

2
resources/metadata/abapEnvironmentCreateSystem.yaml
View File

@@ -196,4 +196,4 @@ spec:
default: false
containers:
- name: cf
image: ppiper/cf-cli:v5
image: ppiper/cf-cli:6

2
resources/metadata/abapEnvironmentPullGitRepo.yaml
View File

@@ -128,4 +128,4 @@ spec:
default: false
containers:
- name: cf
image: ppiper/cf-cli
image: ppiper/cf-cli:6

2
resources/metadata/abapEnvironmentRunATCCheck.yaml
View File

@@ -130,4 +130,4 @@ spec:
default: "ATCResults.xml"
containers:
- name: cf
image: ppiper/cf-cli
image: ppiper/cf-cli:6

2
resources/metadata/cloudFoundryCreateService.yaml
View File

@@ -196,4 +196,4 @@ spec:
- name: cfManifestVariablesFiles
containers:
- name: cf
image: ppiper/cf-cli:v5
image: ppiper/cf-cli:6

2
resources/metadata/cloudFoundryCreateServiceKey.yaml
View File

@@ -115,4 +115,4 @@ spec:
- name: cloudFoundry/serviceKeyConfig
containers:
- name: cf
image: ppiper/cf-cli
image: ppiper/cf-cli:6

2
resources/metadata/cloudFoundryCreateSpace.yaml
View File

@@ -80,4 +80,4 @@ spec:
- name: cloudFoundry/space
containers:
- name: cf
image: ppiper/cf-cli
image: ppiper/cf-cli:6

2
resources/metadata/cloudFoundryDeleteService.yaml
View File

@@ -102,5 +102,5 @@ spec:
- name: cloudFoundry/cfDeleteServiceKeys
containers:
- name: cf
image: ppiper/cf-cli
image: ppiper/cf-cli:6
workingDir: "/home/piper"

2
resources/metadata/cloudFoundryDeleteSpace.yaml
View File

@@ -80,4 +80,4 @@ spec:
- name: cloudFoundry/space
containers:
- name: cf
image: ppiper/cf-cli
image: ppiper/cf-cli:6

2
resources/metadata/cloudFoundryDeploy.yaml
View File

@@ -370,7 +370,7 @@ spec:
- $(vaultBasePath)/GROUP-SECRETS/cloudfoundry-$(org)-$(space)
containers:
- name: cfDeploy
image: ppiper/cf-cli
image: ppiper/cf-cli:6
outputs:
resources:
- name: influx

26
test/groovy/CloudFoundryDeployTest.groovy
View File

@@ -173,7 +173,7 @@ class CloudFoundryDeployTest extends BasePiperTest {
cfManifest: 'test.yml'
])
// asserts
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:v5'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:6'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerWorkspace', '/home/piper'))
assertThat(dockerExecuteRule.dockerParams.dockerEnvVars, hasEntry('STATUS_CODE', "${200}"))
assertThat(shellRule.shell, hasItem(containsString('cf login -u "test_cf" -p \'********\' -a https://api.cf.eu10.hana.ondemand.com -o "testOrg" -s "testSpace"')))
@@ -225,7 +225,7 @@ class CloudFoundryDeployTest extends BasePiperTest {
]
])
// asserts
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:v5'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:6'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerWorkspace', '/home/piper'))
assertThat(dockerExecuteRule.dockerParams.dockerEnvVars, hasEntry('STATUS_CODE', "${200}"))
assertThat(shellRule.shell, hasItem(containsString('cf login -u "test_cf" -p \'********\' -a https://api.cf.eu10.hana.ondemand.com -o "testOrg" -s "testSpace"')))
@@ -421,7 +421,7 @@ class CloudFoundryDeployTest extends BasePiperTest {
cfManifest: 'test.yml'
])
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:v5'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:6'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerWorkspace', '/home/piper'))
assertThat(shellRule.shell, hasItem(containsString('cf login -u "test_cf" -p \'********\' -a https://api.cf.eu10.hana.ondemand.com -o "testOrg" -s "testSpace"')))
@@ -449,7 +449,7 @@ class CloudFoundryDeployTest extends BasePiperTest {
cfManifest: 'test.yml'
])
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:v5'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:6'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerWorkspace', '/home/piper'))
assertThat(shellRule.shell, hasItem(containsString('cf login -u "test_cf" -p \'********\' -a https://api.cf.eu10.hana.ondemand.com -o "testOrg" -s "testSpace"')))
@@ -478,7 +478,7 @@ class CloudFoundryDeployTest extends BasePiperTest {
cfManifest: 'test.yml'
])
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:v5'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:6'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerWorkspace', '/home/piper'))
assertThat(shellRule.shell, hasItem(containsString('cf login -u "test_cf" -p \'********\' -a https://api.cf.eu10.hana.ondemand.com -o "testOrg" -s "testSpace"')))
@@ -559,7 +559,7 @@ class CloudFoundryDeployTest extends BasePiperTest {
cfManifest: 'test.yml'
])
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:v5'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:6'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerWorkspace', '/home/piper'))
assertThat(shellRule.shell, hasItem(containsString('cf login -u "test_cf" -p \'********\' -a https://api.cf.eu10.hana.ondemand.com -o "testOrg" -s "testSpace"')))
@@ -657,7 +657,7 @@ class CloudFoundryDeployTest extends BasePiperTest {
mtaPath: 'target/test.mtar'
])
// asserts
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:v5'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:6'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerWorkspace', '/home/piper'))
assertThat(shellRule.shell, hasItem(containsString('cf login -u "test_cf" -p \'********\' -a https://api.cf.eu10.hana.ondemand.com -o "testOrg" -s "testSpace"')))
assertThat(shellRule.shell, hasItem(containsString('cf deploy target/test.mtar -f')))
@@ -750,7 +750,7 @@ class CloudFoundryDeployTest extends BasePiperTest {
cfManifestVariablesFiles: ['vars.yml']
])
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:v5'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:6'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerWorkspace', '/home/piper'))
assertThat(dockerExecuteRule.dockerParams.dockerEnvVars, hasEntry('STATUS_CODE', "${200}"))
assertThat(shellRule.shell, hasItem(containsString('cf login -u "test_cf" -p \'********\' -a https://api.cf.eu10.hana.ondemand.com -o "testOrg" -s "testSpace"')))
@@ -802,7 +802,7 @@ class CloudFoundryDeployTest extends BasePiperTest {
])
// asserts
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:v5'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:6'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerWorkspace', '/home/piper'))
assertThat(dockerExecuteRule.dockerParams.dockerEnvVars, hasEntry('STATUS_CODE', "${200}"))
assertThat(shellRule.shell, hasItem(containsString('cf login -u "test_cf" -p \'********\' -a https://api.cf.eu10.hana.ondemand.com -o "testOrg" -s "testSpace"')))
@@ -855,7 +855,7 @@ class CloudFoundryDeployTest extends BasePiperTest {
])
// asserts
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:v5'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:6'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerWorkspace', '/home/piper'))
assertThat(dockerExecuteRule.dockerParams.dockerEnvVars, hasEntry('STATUS_CODE', "${200}"))
assertThat(shellRule.shell, hasItem(containsString('cf login -u "test_cf" -p \'********\' -a https://api.cf.eu10.hana.ondemand.com -o "testOrg" -s "testSpace"')))
@@ -880,7 +880,7 @@ class CloudFoundryDeployTest extends BasePiperTest {
])
// asserts
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:v5'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:6'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerWorkspace', '/home/piper'))
assertThat(dockerExecuteRule.dockerParams.dockerEnvVars, hasEntry('STATUS_CODE', "${200}"))
assertThat(shellRule.shell, hasItem(containsString('cf login -u "test_cf" -p \'********\' -a https://api.cf.eu10.hana.ondemand.com -o "testOrg" -s "testSpace"')))
@@ -925,7 +925,7 @@ class CloudFoundryDeployTest extends BasePiperTest {
assertNotNull(testYamlData)
assertThat(testYamlData.get("applications").get(0).get("name"), is("testApplication"))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:v5'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:6'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerWorkspace', '/home/piper'))
assertThat(dockerExecuteRule.dockerParams.dockerEnvVars, hasEntry('STATUS_CODE', "${200}"))
assertThat(shellRule.shell, hasItem(containsString('cf login -u "test_cf" -p \'********\' -a https://api.cf.eu10.hana.ondemand.com -o "testOrg" -s "testSpace"')))
@@ -971,7 +971,7 @@ class CloudFoundryDeployTest extends BasePiperTest {
assertNotNull(testYamlData)
assertThat(testYamlData.get("applications").get(0).get("name"), is("testApplicationFromVarsList"))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:v5'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'ppiper/cf-cli:6'))
assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerWorkspace', '/home/piper'))
assertThat(dockerExecuteRule.dockerParams.dockerEnvVars, hasEntry('STATUS_CODE', "${200}"))
assertThat(shellRule.shell, hasItem(containsString('cf login -u "test_cf" -p \'********\' -a https://api.cf.eu10.hana.ondemand.com -o "testOrg" -s "testSpace"')))

2
test/groovy/MulticloudDeployTest.groovy
View File

@@ -119,7 +119,7 @@ class MulticloudDeployTest extends BasePiperTest {
deployType: 'blue-green',
keepOldInstance: true,
cf_native: [
dockerImage: 'ppiper/cf-cli',
dockerImage: 'ppiper/cf-cli:6',
dockerWorkspace: '/home/piper'
]
]

2
vars/dockerExecuteOnKubernetes.groovy
View File

@@ -87,7 +87,7 @@ import hudson.AbortException
'containerEnvVars',
/**
* A map of docker image to the name of the container. The pod will be created with all the images from this map and they are labelled based on the value field of each map entry.
* Example: `['maven:3.5-jdk-8-alpine': 'mavenExecute', 'selenium/standalone-chrome': 'selenium', 'famiko/jmeter-base': 'checkJMeter', 'ppiper/cf-cli': 'cloudfoundry']`
* Example: `['maven:3.5-jdk-8-alpine': 'mavenExecute', 'selenium/standalone-chrome': 'selenium', 'famiko/jmeter-base': 'checkJMeter', 'ppiper/cf-cli:6': 'cloudfoundry']`
*/
'containerMap',
/**