From 6a6fc2924cbc28185315c9f0a4d44f624d007c9b Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Thu, 30 Mar 2023 15:49:49 -0400 Subject: [PATCH] fix(regression): respect modules enabled by ModuleMd during module builds --- peridot/builder/v1/workflow/arch.go | 11 +++++++++-- peridot/builder/v1/workflow/srpm.go | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/peridot/builder/v1/workflow/arch.go b/peridot/builder/v1/workflow/arch.go index 78ecd9b..9512be3 100644 --- a/peridot/builder/v1/workflow/arch.go +++ b/peridot/builder/v1/workflow/arch.go @@ -687,8 +687,15 @@ func (c *Controller) BuildArchActivity(ctx context.Context, projectId string, pa c.log.Infof("no extra options to process for package") } - extraOptions.DisabledModules = disableModules - extraOptions.Modules = enableModules + if extraOptions.DisabledModules == nil { + extraOptions.DisabledModules = []string{} + } + extraOptions.DisabledModules = append(extraOptions.DisabledModules, disableModules...) + + if extraOptions.Modules == nil { + extraOptions.Modules = []string{} + } + extraOptions.Modules = append(extraOptions.Modules, enableModules...) hostArch := os.Getenv("REAL_BUILD_ARCH") err = c.writeMockConfig(&project, packageVersion, extraOptions, arch, hostArch, pkgGroup) diff --git a/peridot/builder/v1/workflow/srpm.go b/peridot/builder/v1/workflow/srpm.go index 4da0284..9639d0d 100644 --- a/peridot/builder/v1/workflow/srpm.go +++ b/peridot/builder/v1/workflow/srpm.go @@ -425,8 +425,15 @@ func (c *Controller) BuildSRPMActivity(ctx context.Context, upstreamPrefix strin c.log.Infof("no extra options to process for package") } - extraOptions.DisabledModules = disableModules - extraOptions.Modules = enableModules + if extraOptions.DisabledModules == nil { + extraOptions.DisabledModules = []string{} + } + extraOptions.DisabledModules = append(extraOptions.DisabledModules, disableModules...) + + if extraOptions.Modules == nil { + extraOptions.Modules = []string{} + } + extraOptions.Modules = append(extraOptions.Modules, enableModules...) hostArch := os.Getenv("REAL_BUILD_ARCH") extraOptions.EnableNetworking = true