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

2025-10-30 23:57:50 +02:00 · 2021-02-11 09:31:25 +01:00
parent f030bc9861
commit c53d5241cb
29 changed files with 42 additions and 42 deletions
--- a/cmd/abapEnvironmentAssemblePackages_generated.go
+++ b/cmd/abapEnvironmentAssemblePackages_generated.go
@@ -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{
--- a/cmd/abapEnvironmentCheckoutBranch_generated.go
+++ b/cmd/abapEnvironmentCheckoutBranch_generated.go
@@ -221,7 +221,7 @@ func abapEnvironmentCheckoutBranchMetadata() config.StepData {
 				},
 			},
 			Containers: []config.Container{
-				{Name: "cf", Image: "ppiper/cf-cli"},
+				{Name: "cf", Image: "ppiper/cf-cli:6"},
 			},
 		},
 	}
--- a/cmd/abapEnvironmentCloneGitRepo_generated.go
+++ b/cmd/abapEnvironmentCloneGitRepo_generated.go
@@ -221,7 +221,7 @@ func abapEnvironmentCloneGitRepoMetadata() config.StepData {
 				},
 			},
 			Containers: []config.Container{
-				{Name: "cf", Image: "ppiper/cf-cli"},
+				{Name: "cf", Image: "ppiper/cf-cli:6"},
 			},
 		},
 	}
--- a/cmd/abapEnvironmentCreateSystem_generated.go
+++ b/cmd/abapEnvironmentCreateSystem_generated.go
@@ -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"},
 			},
 		},
 	}
--- a/cmd/abapEnvironmentPullGitRepo_generated.go
+++ b/cmd/abapEnvironmentPullGitRepo_generated.go
@@ -221,7 +221,7 @@ func abapEnvironmentPullGitRepoMetadata() config.StepData {
 				},
 			},
 			Containers: []config.Container{
-				{Name: "cf", Image: "ppiper/cf-cli"},
+				{Name: "cf", Image: "ppiper/cf-cli:6"},
 			},
 		},
 	}
--- a/cmd/abapEnvironmentRunATCCheck_generated.go
+++ b/cmd/abapEnvironmentRunATCCheck_generated.go
@@ -214,7 +214,7 @@ func abapEnvironmentRunATCCheckMetadata() config.StepData {
 				},
 			},
 			Containers: []config.Container{
-				{Name: "cf", Image: "ppiper/cf-cli"},
+				{Name: "cf", Image: "ppiper/cf-cli:6"},
 			},
 		},
 	}
--- a/cmd/cloudFoundryCreateServiceKey_generated.go
+++ b/cmd/cloudFoundryCreateServiceKey_generated.go
@@ -203,7 +203,7 @@ func cloudFoundryCreateServiceKeyMetadata() config.StepData {
 				},
 			},
 			Containers: []config.Container{
-				{Name: "cf", Image: "ppiper/cf-cli"},
+				{Name: "cf", Image: "ppiper/cf-cli:6"},
 			},
 		},
 	}
--- a/cmd/cloudFoundryCreateService_generated.go
+++ b/cmd/cloudFoundryCreateService_generated.go
@@ -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"},
 			},
 		},
 	}
--- a/cmd/cloudFoundryCreateSpace_generated.go
+++ b/cmd/cloudFoundryCreateSpace_generated.go
@@ -161,7 +161,7 @@ func cloudFoundryCreateSpaceMetadata() config.StepData {
 				},
 			},
 			Containers: []config.Container{
-				{Name: "cf", Image: "ppiper/cf-cli"},
+				{Name: "cf", Image: "ppiper/cf-cli:6"},
 			},
 		},
 	}
--- a/cmd/cloudFoundryDeleteService_generated.go
+++ b/cmd/cloudFoundryDeleteService_generated.go
@@ -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"},
 			},
 		},
 	}
--- a/cmd/cloudFoundryDeleteSpace_generated.go
+++ b/cmd/cloudFoundryDeleteSpace_generated.go
@@ -161,7 +161,7 @@ func cloudFoundryDeleteSpaceMetadata() config.StepData {
 				},
 			},
 			Containers: []config.Container{
-				{Name: "cf", Image: "ppiper/cf-cli"},
+				{Name: "cf", Image: "ppiper/cf-cli:6"},
 			},
 		},
 	}
--- a/cmd/cloudFoundryDeploy_generated.go
+++ b/cmd/cloudFoundryDeploy_generated.go
@@ -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{
--- a/documentation/docs/steps/dockerExecuteOnKubernetes.md
+++ b/documentation/docs/steps/dockerExecuteOnKubernetes.md
@@ -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"
    }
--- a/resources/default_pipeline_environment.yml
+++ b/resources/default_pipeline_environment.yml
@@ -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'
--- a/resources/metadata/abapEnvironmentAssemblePackages.yaml
+++ b/resources/metadata/abapEnvironmentAssemblePackages.yaml
@@ -125,4 +125,4 @@ spec:
          - name: abap/addonDescriptor
  containers:
    - name: cf
-      image: ppiper/cf-cli
+      image: ppiper/cf-cli:6
--- a/resources/metadata/abapEnvironmentCheckoutBranch.yaml
+++ b/resources/metadata/abapEnvironmentCheckoutBranch.yaml
@@ -129,4 +129,4 @@ spec:
          - name: cfServiceKeyName
  containers:
    - name: cf
-      image: ppiper/cf-cli
+      image: ppiper/cf-cli:6
--- a/resources/metadata/abapEnvironmentCloneGitRepo.yaml
+++ b/resources/metadata/abapEnvironmentCloneGitRepo.yaml
@@ -129,4 +129,4 @@ spec:
          - name: cfServiceKey
  containers:
    - name: cf
-      image: ppiper/cf-cli
+      image: ppiper/cf-cli:6
--- a/resources/metadata/abapEnvironmentCreateSystem.yaml
+++ b/resources/metadata/abapEnvironmentCreateSystem.yaml
@@ -196,4 +196,4 @@ spec:
        default: false
  containers:
    - name: cf
-      image: ppiper/cf-cli:v5
+      image: ppiper/cf-cli:6
--- a/resources/metadata/abapEnvironmentPullGitRepo.yaml
+++ b/resources/metadata/abapEnvironmentPullGitRepo.yaml
@@ -128,4 +128,4 @@ spec:
        default: false
  containers:
    - name: cf
-      image: ppiper/cf-cli
+      image: ppiper/cf-cli:6
--- a/resources/metadata/abapEnvironmentRunATCCheck.yaml
+++ b/resources/metadata/abapEnvironmentRunATCCheck.yaml
@@ -130,4 +130,4 @@ spec:
        default: "ATCResults.xml"
  containers:
    - name: cf
-      image: ppiper/cf-cli
+      image: ppiper/cf-cli:6
--- a/resources/metadata/cloudFoundryCreateService.yaml
+++ b/resources/metadata/cloudFoundryCreateService.yaml
@@ -196,4 +196,4 @@ spec:
          - name: cfManifestVariablesFiles
  containers:
    - name: cf
-      image: ppiper/cf-cli:v5
+      image: ppiper/cf-cli:6
--- a/resources/metadata/cloudFoundryCreateServiceKey.yaml
+++ b/resources/metadata/cloudFoundryCreateServiceKey.yaml
@@ -115,4 +115,4 @@ spec:
          - name: cloudFoundry/serviceKeyConfig
  containers:
    - name: cf
-      image: ppiper/cf-cli
+      image: ppiper/cf-cli:6
--- a/resources/metadata/cloudFoundryCreateSpace.yaml
+++ b/resources/metadata/cloudFoundryCreateSpace.yaml
@@ -80,4 +80,4 @@ spec:
          - name: cloudFoundry/space
  containers:
    - name: cf
-      image: ppiper/cf-cli
+      image: ppiper/cf-cli:6
--- a/resources/metadata/cloudFoundryDeleteService.yaml
+++ b/resources/metadata/cloudFoundryDeleteService.yaml
@@ -102,5 +102,5 @@ spec:
          - name: cloudFoundry/cfDeleteServiceKeys
  containers:
    - name: cf
-      image: ppiper/cf-cli
+      image: ppiper/cf-cli:6
      workingDir: "/home/piper"
--- a/resources/metadata/cloudFoundryDeleteSpace.yaml
+++ b/resources/metadata/cloudFoundryDeleteSpace.yaml
@@ -80,4 +80,4 @@ spec:
          - name: cloudFoundry/space
  containers:
    - name: cf
-      image: ppiper/cf-cli
+      image: ppiper/cf-cli:6
--- a/resources/metadata/cloudFoundryDeploy.yaml
+++ b/resources/metadata/cloudFoundryDeploy.yaml
@@ -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
--- a/test/groovy/CloudFoundryDeployTest.groovy
+++ b/test/groovy/CloudFoundryDeployTest.groovy
@@ -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"')))
--- a/test/groovy/MulticloudDeployTest.groovy
+++ b/test/groovy/MulticloudDeployTest.groovy
@@ -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'
                    ]
                ]
--- a/vars/dockerExecuteOnKubernetes.groovy
+++ b/vars/dockerExecuteOnKubernetes.groovy
@@ -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',
    /**