diff --git a/internal/manifest/anaconda.go b/internal/manifest/anaconda.go index feac38302..4099eefbd 100644 --- a/internal/manifest/anaconda.go +++ b/internal/manifest/anaconda.go @@ -66,10 +66,11 @@ func NewAnaconda(m *Manifest, kernelName, product, version string) *Anaconda { + name := "anaconda-tree" p := &Anaconda{ - Base: NewBase(m, "anaconda-tree", buildPipeline), + Base: NewBase(m, name, buildPipeline), platform: platform, - repos: repos, + repos: filterRepos(repos, name), kernelName: kernelName, product: product, version: version, diff --git a/internal/manifest/build.go b/internal/manifest/build.go index 7cfc24ca1..d19957793 100644 --- a/internal/manifest/build.go +++ b/internal/manifest/build.go @@ -25,11 +25,12 @@ type Build struct { // NewBuild creates a new build pipeline from the repositories in repos // and the specified packages. func NewBuild(m *Manifest, runner runner.Runner, repos []rpmmd.RepoConfig) *Build { + name := "build" pipeline := &Build{ - Base: NewBase(m, "build", nil), + Base: NewBase(m, name, nil), runner: runner, dependents: make([]Pipeline, 0), - repos: repos, + repos: filterRepos(repos, name), } m.addPipeline(pipeline) return pipeline diff --git a/internal/manifest/commit_server_tree.go b/internal/manifest/commit_server_tree.go index 7bee17557..100e0402c 100644 --- a/internal/manifest/commit_server_tree.go +++ b/internal/manifest/commit_server_tree.go @@ -41,10 +41,11 @@ func NewOSTreeCommitServer(m *Manifest, commitPipeline *OSTreeCommit, nginxConfigPath, listenPort string) *OSTreeCommitServer { + name := "container-tree" p := &OSTreeCommitServer{ - Base: NewBase(m, "container-tree", buildPipeline), + Base: NewBase(m, name, buildPipeline), platform: platform, - repos: repos, + repos: filterRepos(repos, name), commitPipeline: commitPipeline, nginxConfigPath: nginxConfigPath, listenPort: listenPort, diff --git a/internal/manifest/coreos_installer.go b/internal/manifest/coreos_installer.go index 7942b3c37..454da1ab7 100644 --- a/internal/manifest/coreos_installer.go +++ b/internal/manifest/coreos_installer.go @@ -50,10 +50,11 @@ func NewCoreOSInstaller(m *Manifest, kernelName, product, version string) *CoreOSInstaller { + name := "coi-tree" p := &CoreOSInstaller{ - Base: NewBase(m, "coi-tree", buildPipeline), + Base: NewBase(m, name, buildPipeline), platform: platform, - repos: repos, + repos: filterRepos(repos, name), kernelName: kernelName, product: product, version: version, diff --git a/internal/manifest/os.go b/internal/manifest/os.go index f3017438b..c73c7071c 100644 --- a/internal/manifest/os.go +++ b/internal/manifest/os.go @@ -154,9 +154,10 @@ func NewOS(m *Manifest, buildPipeline *Build, platform platform.Platform, repos []rpmmd.RepoConfig) *OS { + name := "os" p := &OS{ - Base: NewBase(m, "os", buildPipeline), - repos: repos, + Base: NewBase(m, name, buildPipeline), + repos: filterRepos(repos, name), platform: platform, } buildPipeline.addDependent(p)