jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-03-05 15:15:44 +02:00
Code Issues Releases Activity

Do not merge before go live of steampunk 2205! Insert generic build step into abap environment pipeline (#3507)

Browse Source 
* enhance build step

* Update abapEnvironmentBuild.go

* build with addonDescriptor

* use addondescriptor

* Use Addondescriptor

* add error

* improve logging

* rename intervall to interval

* update yaml

* Update abapEnvironmentBuild.go

* Update abapEnvironmentBuild.yaml

* insert generation phase

* we do not know what we have done

* Add createServiceKey to test

Co-authored-by: tiloKo <70266685+tiloKo@users.noreply.github.com>
Co-authored-by: Daniel Mieg <daniel.mieg@sap.com>
This commit is contained in:
rosemarieB 2022-05-23 13:47:03 +02:00 committed by GitHub
parent d883a729b0
commit d30395931b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/abapEnvironmentBuild.go
View File

@ -4,6 +4,7 @@ import (
"encoding/json" "encoding/json"
"reflect" "reflect"
"strings" "strings"
"time" "time"
abapbuild "github.com/SAP/jenkins-library/pkg/abap/build" abapbuild "github.com/SAP/jenkins-library/pkg/abap/build"

2
resources/com.sap.piper/pipeline/abapEnvironmentPipelineStageDefaults.yml
View File

@ -42,6 +42,8 @@ stages:
abapSystemSizeOfRuntime: 1 abapSystemSizeOfRuntime: 1
confirmDeletion: 'true' confirmDeletion: 'true'
includeAddon: 'true' includeAddon: 'true'
cfServiceKeyName: 'sap_com_0582'
cfServiceKeyConfig: '{"scenario_id":"SAP_COM_0582","type":"basic"}'
Confirm: Confirm:
ordinal: 80 ordinal: 80

6
test/groovy/templates/AbapEnvironmentPipelineStageIntegrationTestsTest.groovy
View File

@ -41,6 +41,8 @@ class abapEnvironmentPipelineStageIntegrationTestsTest extends BasePiperTest {
}) })
helper.registerAllowedMethod('abapEnvironmentCreateSystem', [Map.class], {m -> stepsCalled.add('abapEnvironmentCreateSystem')}) helper.registerAllowedMethod('abapEnvironmentCreateSystem', [Map.class], {m -> stepsCalled.add('abapEnvironmentCreateSystem')})
helper.registerAllowedMethod('cloudFoundryDeleteService', [Map.class], {m -> stepsCalled.add('cloudFoundryDeleteService')}) helper.registerAllowedMethod('cloudFoundryDeleteService', [Map.class], {m -> stepsCalled.add('cloudFoundryDeleteService')})
helper.registerAllowedMethod('abapEnvironmentBuild', [Map.class], {m -> stepsCalled.add('abapEnvironmentBuild')})
helper.registerAllowedMethod('cloudFoundryCreateServiceKey', [Map.class], {m -> stepsCalled.add('cloudFoundryCreateServiceKey')})
} }
@Test @Test
@ -54,6 +56,8 @@ class abapEnvironmentPipelineStageIntegrationTestsTest extends BasePiperTest {
assertThat(stepsCalled, hasItems('input')) assertThat(stepsCalled, hasItems('input'))
assertThat(stepsCalled, hasItems('abapEnvironmentCreateSystem')) assertThat(stepsCalled, hasItems('abapEnvironmentCreateSystem'))
assertThat(stepsCalled, hasItems('cloudFoundryDeleteService')) assertThat(stepsCalled, hasItems('cloudFoundryDeleteService'))
assertThat(stepsCalled, hasItems('abapEnvironmentBuild'))
assertThat(stepsCalled, hasItems('cloudFoundryCreateServiceKey'))
} }
@Test @Test
@ -68,6 +72,8 @@ class abapEnvironmentPipelineStageIntegrationTestsTest extends BasePiperTest {
assertThat(stepsCalled, not(hasItem('input'))) assertThat(stepsCalled, not(hasItem('input')))
assertThat(stepsCalled, hasItems('abapEnvironmentCreateSystem')) assertThat(stepsCalled, hasItems('abapEnvironmentCreateSystem'))
assertThat(stepsCalled, hasItems('cloudFoundryDeleteService')) assertThat(stepsCalled, hasItems('cloudFoundryDeleteService'))
assertThat(stepsCalled, hasItems('abapEnvironmentBuild'))
assertThat(stepsCalled, hasItems('cloudFoundryCreateServiceKey'))
} }
@Test @Test

1
vars/abapEnvironmentPipelineStageBuild.groovy
View File

@ -27,6 +27,7 @@ void call(Map parameters = [:]) {
piperStageWrapper (script: script, stageName: stageName, stashContent: [], stageLocking: false) { piperStageWrapper (script: script, stageName: stageName, stashContent: [], stageLocking: false) {
cloudFoundryCreateServiceKey script: parameters.script cloudFoundryCreateServiceKey script: parameters.script
abapEnvironmentAssemblePackages script: parameters.script abapEnvironmentAssemblePackages script: parameters.script
abapEnvironmentBuild(script: parameters.script, phase: 'GENERATION', downloadAllResultFiles: true, useFieldsOfAddonDescriptor: '[{"use":"Name","renameTo":"SWC"}]')
abapAddonAssemblyKitRegisterPackages script: parameters.script abapAddonAssemblyKitRegisterPackages script: parameters.script
abapAddonAssemblyKitReleasePackages script: parameters.script abapAddonAssemblyKitReleasePackages script: parameters.script
abapEnvironmentAssembleConfirm script: parameters.script abapEnvironmentAssembleConfirm script: parameters.script

2
vars/abapEnvironmentPipelineStageIntegrationTests.groovy
View File

@ -37,6 +37,8 @@ void call(Map parameters = [:]) {
piperStageWrapper (script: script, stageName: stageName, stashContent: [], stageLocking: false) { piperStageWrapper (script: script, stageName: stageName, stashContent: [], stageLocking: false) {
try { try {
abapEnvironmentCreateSystem(script: parameters.script, includeAddon: true) abapEnvironmentCreateSystem(script: parameters.script, includeAddon: true)
cloudFoundryCreateServiceKey(script: parameters.script)
abapEnvironmentBuild(script: parameters.script, phase: 'GENERATION', downloadAllResultFiles: true, useFieldsOfAddonDescriptor: '[{"use":"Name","renameTo":"SWC"}]')
} catch (Exception e) { } catch (Exception e) {
echo "Deployment test of add-on product failed." echo "Deployment test of add-on product failed."
throw e throw e