From f262f2146f517ff8076e06609da1eb11289b0cd1 Mon Sep 17 00:00:00 2001 From: Ivan Nikiforov Date: Fri, 7 Mar 2025 18:29:49 +0100 Subject: [PATCH 1/3] Add GenerateDocumentation directive --- vars/karmaExecuteTests.groovy | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vars/karmaExecuteTests.groovy b/vars/karmaExecuteTests.groovy index 58f218eb20..c6dabc36bd 100644 --- a/vars/karmaExecuteTests.groovy +++ b/vars/karmaExecuteTests.groovy @@ -11,6 +11,10 @@ import groovy.transform.Field @Field String STEP_NAME = getClass().getName() @Field String METADATA_FILE = 'metadata/karmaExecuteTests.yaml' +/** + * Executes the Karma tests. + */ +@GenerateDocumentation void call(Map parameters = [:]) { List credentials = [ [type: 'usernamePassword', id: 'seleniumHubCredentialsId', env: ['PIPER_SELENIUM_HUB_USER', 'PIPER_SELENIUM_HUB_PASSWORD']], From 628d60859f656ba991e156e6c1803bc7ffb43653 Mon Sep 17 00:00:00 2001 From: Ivan Nikiforov Date: Mon, 24 Mar 2025 13:28:54 +0100 Subject: [PATCH 2/3] Explicitly declare stash used by cloudFoundryDeploy --- cmd/cloudFoundryDeploy_generated.go | 3 +++ resources/metadata/cloudFoundryDeploy.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cmd/cloudFoundryDeploy_generated.go b/cmd/cloudFoundryDeploy_generated.go index 09edb8f501..28437567a1 100644 --- a/cmd/cloudFoundryDeploy_generated.go +++ b/cmd/cloudFoundryDeploy_generated.go @@ -280,6 +280,9 @@ func cloudFoundryDeployMetadata() config.StepData { {Name: "cfCredentialsId", Description: "Jenkins 'Username with password' credentials ID containing user and password to authenticate to the Cloud Foundry API.", Type: "jenkins", Aliases: []config.Alias{{Name: "cloudFoundry/credentialsId", Deprecated: true}}}, {Name: "dockerCredentialsId", Description: "Jenkins 'Username with password' credentials ID containing user and password to authenticate to the Docker registry.", Type: "jenkins"}, }, + Resources: []config.StepResources{ + {Name: "deployDescriptor", Type: "stash"}, + }, Parameters: []config.StepParameters{ { Name: "apiEndpoint", diff --git a/resources/metadata/cloudFoundryDeploy.yaml b/resources/metadata/cloudFoundryDeploy.yaml index 5d6a96dc40..3d22e3d70c 100644 --- a/resources/metadata/cloudFoundryDeploy.yaml +++ b/resources/metadata/cloudFoundryDeploy.yaml @@ -23,6 +23,9 @@ spec: - name: dockerCredentialsId description: Jenkins 'Username with password' credentials ID containing user and password to authenticate to the Docker registry. type: jenkins + resources: + - name: deployDescriptor + type: stash params: - name: apiEndpoint type: string From 98b12cb48fc87290982df5cbc1cc136f3a47dd55 Mon Sep 17 00:00:00 2001 From: Ivan Nikiforov Date: Mon, 24 Mar 2025 14:00:50 +0100 Subject: [PATCH 3/3] Update karmaExecuteTests.groovy Remove unneeded docs --- vars/karmaExecuteTests.groovy | 4 ---- 1 file changed, 4 deletions(-) diff --git a/vars/karmaExecuteTests.groovy b/vars/karmaExecuteTests.groovy index c6dabc36bd..58f218eb20 100644 --- a/vars/karmaExecuteTests.groovy +++ b/vars/karmaExecuteTests.groovy @@ -11,10 +11,6 @@ import groovy.transform.Field @Field String STEP_NAME = getClass().getName() @Field String METADATA_FILE = 'metadata/karmaExecuteTests.yaml' -/** - * Executes the Karma tests. - */ -@GenerateDocumentation void call(Map parameters = [:]) { List credentials = [ [type: 'usernamePassword', id: 'seleniumHubCredentialsId', env: ['PIPER_SELENIUM_HUB_USER', 'PIPER_SELENIUM_HUB_PASSWORD']],