jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2024-12-12 10:55:20 +02:00
Code Issues Releases Activity

Update abapEnvironmentAssembleConfirm.go (#3825)

Browse Source 
* Update abapEnvironmentAssembleConfirm.go
This commit is contained in:
tiloKo 2022-06-13 13:13:15 +02:00 committed by GitHub
parent 011ba40f87
commit 114e91f328
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/abapEnvironmentAssembleConfirm.go
View File

@ -123,7 +123,7 @@ func polling(builds []buildWithRepository, maxRuntimeInMinutes time.Duration, po
} }
func (b *buildWithRepository) startConfirm() error { func (b *buildWithRepository) startConfirm() error {
if b.repo.Name == "" || b.repo.Namespace == "" || b.repo.PackageName == "" { if b.repo.Name == "" || b.repo.PackageName == "" {
return errors.New("Parameters missing. Please provide software component name, namespace and packagename") return errors.New("Parameters missing. Please provide software component name, namespace and packagename")
} }
valuesInput := abapbuild.Values{ valuesInput := abapbuild.Values{
@ -132,12 +132,23 @@ func (b *buildWithRepository) startConfirm() error {
ValueID: "SWC", ValueID: "SWC",
Value: b.repo.Name, Value: b.repo.Name,
}, },
{
ValueID: "SSDC-delta",
Value: b.repo.Namespace + b.repo.PackageName,
},
}, },
} }
if b.repo.Namespace != "" {
// Steampunk Use Case, Namespace provided by AAKaaS
valuesInput.Values = append(valuesInput.Values,
abapbuild.Value{ValueID: "SSDC-delta",
Value: b.repo.Namespace + b.repo.PackageName})
} else {
// Traditional SWCs, Namespace to be provided in assembly system via build script
valuesInput.Values = append(valuesInput.Values,
abapbuild.Value{ValueID: "PACKAGE_TYPE",
Value: b.repo.PackageType})
valuesInput.Values = append(valuesInput.Values,
abapbuild.Value{ValueID: "PACKAGE_NAME_" + b.repo.PackageType,
Value: b.repo.PackageName})
}
phase := "BUILD_CONFIRM" phase := "BUILD_CONFIRM"
log.Entry().Infof("Starting confirmation of package %s", b.repo.PackageName) log.Entry().Infof("Starting confirmation of package %s", b.repo.PackageName)
return b.build.Start(phase, valuesInput) return b.build.Start(phase, valuesInput)