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

Variable Dotted Version String fixes (#4220)

Browse Source
This commit is contained in:
tiloKo 2023-02-07 10:02:40 +01:00 committed by GitHub
parent 5201733150
commit 501f7d214d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/abap/aakaas/componentVersion.go
View File

@ -18,7 +18,7 @@ type ComponentVersion struct {
}
func (c *ComponentVersion) ConstructComponentVersion(repo abaputils.Repository, conn abapbuild.Connector) error {
if err := c.constructVersionable(repo.Name, repo.VersionYAML, conn, pvQueryURL); err != nil {
if err := c.constructVersionable(repo.Name, repo.VersionYAML, conn, cvQueryURL); err != nil {
return err
}
if err := c.resolveNext(); err != nil {
@ -32,6 +32,7 @@ func (c *ComponentVersion) CopyVersionFieldsToRepo(repo *abaputils.Repository) {
repo.Version = c.TechRelease
repo.SpLevel = c.TechSpLevel
repo.PatchLevel = c.TechPatchLevel
repo.VersionYAML = c.Version
}
func (c *ComponentVersion) Validate() error {

1
pkg/abap/aakaas/productVersion.go
View File

@ -31,6 +31,7 @@ func (p *ProductVersion) CopyVersionFieldsToDescriptor(desc *abaputils.AddonDesc
desc.AddonVersion = p.TechRelease
desc.AddonSpsLevel = p.TechSpLevel
desc.AddonPatchLevel = p.TechPatchLevel
desc.AddonVersionYAML = p.Version
}
func (p *ProductVersion) ValidateAndResolveVersionFields() error {

1
pkg/abap/aakaas/versionables.go
View File

@ -159,6 +159,7 @@ func (v *versionable) queryVersion(filter string, orderBy string) (*versionable,
return &result, errors.New("Unexpected Number of CVs in result: " + fmt.Sprint(len(Versions.Wrapper.Vs)))
}
}
log.Entry().Infof("... looked up highest existing package in AAKaaS of the codeline: %s.%s.%s", result.TechRelease, result.TechSpLevel, result.TechPatchLevel)
return &result, nil
}