Skip to content

Commit

Permalink
manifest: allow passing modules
Browse files Browse the repository at this point in the history 
Add the modules to serializestart, they are treated the same as
repositories. Nothing is actually passing in the modules yet.

Signed-off-by: Simon de Vlieger <[email protected]>
  • Loading branch information
@supakeen @thozza
supakeen authored and thozza committed Jan 9, 2025
1 parent 310b2aa commit 0469265
Show file tree
Hide file tree
Showing 16 changed files with 45 additions and 41 deletions.
2 changes: 1 addition & 1 deletion pkg/manifest/anaconda_installer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ func (p *AnacondaInstaller) getPackageSpecs() []rpmmd.PackageSpec {
return p.packageSpecs
}

func (p *AnacondaInstaller) serializeStart(packages []rpmmd.PackageSpec, _ []container.Spec, _ []ostree.CommitSpec, rpmRepos []rpmmd.RepoConfig) {
func (p *AnacondaInstaller) serializeStart(packages []rpmmd.PackageSpec, _ []container.Spec, _ []ostree.CommitSpec, rpmRepos []rpmmd.RepoConfig, _ []rpmmd.ModuleConfig) {
if len(p.packageSpecs) > 0 {
panic("double call to serializeStart()")
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/manifest/anaconda_installer_iso_tree.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ func (p *AnacondaInstallerISOTree) getBuildPackages(_ Distro) []string {
return packages
}

func (p *AnacondaInstallerISOTree) serializeStart(_ []rpmmd.PackageSpec, containers []container.Spec, commits []ostree.CommitSpec, _ []rpmmd.RepoConfig) {
func (p *AnacondaInstallerISOTree) serializeStart(_ []rpmmd.PackageSpec, containers []container.Spec, commits []ostree.CommitSpec, _ []rpmmd.RepoConfig, _ []rpmmd.ModuleConfig) {
if p.ostreeCommitSpec != nil || p.containerSpec != nil {
panic("double call to serializeStart()")
}
Expand Down
48 changes: 24 additions & 24 deletions pkg/manifest/anaconda_installer_iso_tree_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,11 +266,11 @@ func TestAnacondaISOTreePayloadsBad(t *testing.T) {

assert.PanicsWithValue(
"pipeline supports at most one ostree commit",
func() { pipeline.serializeStart(nil, nil, make([]ostree.CommitSpec, 2), nil) },
func() { pipeline.serializeStart(nil, nil, make([]ostree.CommitSpec, 2), nil, nil) },
)
assert.PanicsWithValue(
"pipeline supports at most one container",
func() { pipeline.serializeStart(nil, make([]container.Spec, 2), nil, nil) },
func() { pipeline.serializeStart(nil, make([]container.Spec, 2), nil, nil, nil) },
)
}

Expand All @@ -290,7 +290,7 @@ func TestAnacondaISOTreeSerializeWithOS(t *testing.T) {
t.Run("plain", func(t *testing.T) {
pipeline := newTestAnacondaISOTree()
pipeline.OSPipeline = osPayload
pipeline.serializeStart(nil, nil, nil, nil)
pipeline.serializeStart(nil, nil, nil, nil, nil)
sp := pipeline.serialize()
pipeline.serializeEnd()
assert.NoError(t, checkISOTreeStages(sp.Stages, payloadStages,
Expand All @@ -303,7 +303,7 @@ func TestAnacondaISOTreeSerializeWithOS(t *testing.T) {
pipeline := newTestAnacondaISOTree()
pipeline.OSPipeline = osPayload
pipeline.Kickstart = &kickstart.Options{Path: testKsPath}
pipeline.serializeStart(nil, nil, nil, nil)
pipeline.serializeStart(nil, nil, nil, nil, nil)
sp := pipeline.serialize()
pipeline.serializeEnd()
assert.NoError(t, checkISOTreeStages(sp.Stages, append(payloadStages, "org.osbuild.kickstart"),
Expand All @@ -316,7 +316,7 @@ func TestAnacondaISOTreeSerializeWithOS(t *testing.T) {
pipeline.OSPipeline = osPayload
pipeline.Kickstart = &kickstart.Options{Path: testKsPath}
pipeline.ISOLinux = true
pipeline.serializeStart(nil, nil, nil, nil)
pipeline.serializeStart(nil, nil, nil, nil, nil)
sp := pipeline.serialize()
pipeline.serializeEnd()
assert.NoError(t, checkISOTreeStages(sp.Stages, append(payloadStages, "org.osbuild.isolinux", "org.osbuild.kickstart"),
Expand All @@ -328,7 +328,7 @@ func TestAnacondaISOTreeSerializeWithOS(t *testing.T) {
pipeline.OSPipeline = osPayload
pipeline.Kickstart = &kickstart.Options{Path: testKsPath, Unattended: true}
pipeline.ISOLinux = true
pipeline.serializeStart(nil, nil, nil, nil)
pipeline.serializeStart(nil, nil, nil, nil, nil)
sp := pipeline.serialize()
pipeline.serializeEnd()
assert.NoError(t, checkISOTreeStages(sp.Stages, append(payloadStages, "org.osbuild.isolinux", "org.osbuild.kickstart"),
Expand All @@ -345,7 +345,7 @@ func TestAnacondaISOTreeSerializeWithOS(t *testing.T) {
SudoNopasswd: []string{`%wheel`, `%sudo`},
}
pipeline.ISOLinux = true
pipeline.serializeStart(nil, nil, nil, nil)
pipeline.serializeStart(nil, nil, nil, nil, nil)
sp := pipeline.serialize()
pipeline.serializeEnd()
assert.NoError(t, checkISOTreeStages(sp.Stages, append(payloadStages, "org.osbuild.isolinux", "org.osbuild.kickstart"),
Expand All @@ -365,7 +365,7 @@ func TestAnacondaISOTreeSerializeWithOS(t *testing.T) {
},
}
pipeline.ISOLinux = true
pipeline.serializeStart(nil, nil, nil, nil)
pipeline.serializeStart(nil, nil, nil, nil, nil)
sp := pipeline.serialize()
pipeline.serializeEnd()
assert.NoError(t, checkISOTreeStages(sp.Stages, append(payloadStages, "org.osbuild.isolinux", "org.osbuild.kickstart"),
Expand All @@ -385,7 +385,7 @@ func TestAnacondaISOTreeSerializeWithOS(t *testing.T) {
},
}
pipeline.ISOLinux = true
pipeline.serializeStart(nil, nil, nil, nil)
pipeline.serializeStart(nil, nil, nil, nil, nil)
assert.Panics(t, func() { pipeline.serialize() })
})

Expand All @@ -401,7 +401,7 @@ func TestAnacondaISOTreeSerializeWithOS(t *testing.T) {
},
}
pipeline.ISOLinux = true
pipeline.serializeStart(nil, nil, nil, nil)
pipeline.serializeStart(nil, nil, nil, nil, nil)
assert.Panics(t, func() { pipeline.serialize() })
})
}
Expand All @@ -428,7 +428,7 @@ func TestAnacondaISOTreeSerializeWithOSTree(t *testing.T) {
t.Run("plain", func(t *testing.T) {
pipeline := newTestAnacondaISOTree()
pipeline.Kickstart = &kickstart.Options{Path: testKsPath, OSTree: &kickstart.OSTree{}}
pipeline.serializeStart(nil, nil, []ostree.CommitSpec{ostreeCommit}, nil)
pipeline.serializeStart(nil, nil, []ostree.CommitSpec{ostreeCommit}, nil, nil)
sp := pipeline.serialize()
pipeline.serializeEnd()
assert.NoError(t, checkISOTreeStages(sp.Stages, payloadStages,
Expand All @@ -440,7 +440,7 @@ func TestAnacondaISOTreeSerializeWithOSTree(t *testing.T) {
pipeline := newTestAnacondaISOTree()
pipeline.Kickstart = &kickstart.Options{Path: testKsPath, OSTree: &kickstart.OSTree{}}
pipeline.ISOLinux = true
pipeline.serializeStart(nil, nil, []ostree.CommitSpec{ostreeCommit}, nil)
pipeline.serializeStart(nil, nil, []ostree.CommitSpec{ostreeCommit}, nil, nil)
sp := pipeline.serialize()
pipeline.serializeEnd()
assert.NoError(t, checkISOTreeStages(sp.Stages, append(payloadStages, "org.osbuild.isolinux"), variantStages))
Expand All @@ -450,7 +450,7 @@ func TestAnacondaISOTreeSerializeWithOSTree(t *testing.T) {
pipeline := newTestAnacondaISOTree()
pipeline.Kickstart = &kickstart.Options{Path: testKsPath, Unattended: true, OSTree: &kickstart.OSTree{}}
pipeline.ISOLinux = true
pipeline.serializeStart(nil, nil, []ostree.CommitSpec{ostreeCommit}, nil)
pipeline.serializeStart(nil, nil, []ostree.CommitSpec{ostreeCommit}, nil, nil)
sp := pipeline.serialize()
pipeline.serializeEnd()
assert.NoError(t, checkISOTreeStages(sp.Stages, append(payloadStages, "org.osbuild.isolinux"), variantStages))
Expand All @@ -466,7 +466,7 @@ func TestAnacondaISOTreeSerializeWithOSTree(t *testing.T) {
OSTree: &kickstart.OSTree{},
}
pipeline.ISOLinux = true
pipeline.serializeStart(nil, nil, []ostree.CommitSpec{ostreeCommit}, nil)
pipeline.serializeStart(nil, nil, []ostree.CommitSpec{ostreeCommit}, nil, nil)
sp := pipeline.serialize()
pipeline.serializeEnd()
assert.NoError(t, checkISOTreeStages(sp.Stages, append(payloadStages, "org.osbuild.isolinux"), variantStages))
Expand All @@ -485,7 +485,7 @@ func TestAnacondaISOTreeSerializeWithOSTree(t *testing.T) {
OSTree: &kickstart.OSTree{},
}
pipeline.ISOLinux = true
pipeline.serializeStart(nil, nil, []ostree.CommitSpec{ostreeCommit}, nil)
pipeline.serializeStart(nil, nil, []ostree.CommitSpec{ostreeCommit}, nil, nil)
sp := pipeline.serialize()
pipeline.serializeEnd()
assert.NoError(t, checkISOTreeStages(sp.Stages, append(payloadStages, "org.osbuild.isolinux"), variantStages))
Expand All @@ -504,7 +504,7 @@ func TestAnacondaISOTreeSerializeWithOSTree(t *testing.T) {
OSTree: &kickstart.OSTree{},
}
pipeline.ISOLinux = true
pipeline.serializeStart(nil, nil, []ostree.CommitSpec{ostreeCommit}, nil)
pipeline.serializeStart(nil, nil, []ostree.CommitSpec{ostreeCommit}, nil, nil)
assert.Panics(t, func() { pipeline.serialize() })
})

Expand All @@ -521,7 +521,7 @@ func TestAnacondaISOTreeSerializeWithOSTree(t *testing.T) {
OSTree: &kickstart.OSTree{},
}
pipeline.ISOLinux = true
pipeline.serializeStart(nil, nil, []ostree.CommitSpec{ostreeCommit}, nil)
pipeline.serializeStart(nil, nil, []ostree.CommitSpec{ostreeCommit}, nil, nil)
assert.Panics(t, func() { pipeline.serialize() })
})
}
Expand Down Expand Up @@ -552,7 +552,7 @@ func TestAnacondaISOTreeSerializeWithContainer(t *testing.T) {
t.Run("kspath", func(t *testing.T) {
pipeline := newTestAnacondaISOTree()
pipeline.Kickstart = &kickstart.Options{Path: testKsPath}
pipeline.serializeStart(nil, []container.Spec{containerPayload}, nil, nil)
pipeline.serializeStart(nil, []container.Spec{containerPayload}, nil, nil, nil)
sp := pipeline.serialize()
pipeline.serializeEnd()
assert.NoError(t, checkISOTreeStages(sp.Stages, payloadStages,
Expand All @@ -564,7 +564,7 @@ func TestAnacondaISOTreeSerializeWithContainer(t *testing.T) {
pipeline := newTestAnacondaISOTree()
pipeline.Kickstart = &kickstart.Options{Path: testKsPath}
pipeline.ISOLinux = true
pipeline.serializeStart(nil, []container.Spec{containerPayload}, nil, nil)
pipeline.serializeStart(nil, []container.Spec{containerPayload}, nil, nil, nil)
sp := pipeline.serialize()
pipeline.serializeEnd()
assert.NoError(t, checkISOTreeStages(sp.Stages, append(payloadStages, "org.osbuild.isolinux"), variantStages))
Expand All @@ -577,7 +577,7 @@ func TestAnacondaISOTreeSerializeWithContainer(t *testing.T) {
Unattended: true,
KernelOptionsAppend: []string{"kernel.opt=1", "debug"},
}
pipeline.serializeStart(nil, []container.Spec{containerPayload}, nil, nil)
pipeline.serializeStart(nil, []container.Spec{containerPayload}, nil, nil, nil)
sp := pipeline.serialize()
pipeline.serializeEnd()
kickstartSt := findStage("org.osbuild.kickstart", sp.Stages)
Expand All @@ -589,7 +589,7 @@ func TestAnacondaISOTreeSerializeWithContainer(t *testing.T) {
t.Run("network-on-boot", func(t *testing.T) {
pipeline := newTestAnacondaISOTree()
pipeline.Kickstart = &kickstart.Options{Path: testKsPath, NetworkOnBoot: true}
pipeline.serializeStart(nil, []container.Spec{containerPayload}, nil, nil)
pipeline.serializeStart(nil, []container.Spec{containerPayload}, nil, nil, nil)
sp := pipeline.serialize()
pipeline.serializeEnd()
kickstartSt := findStage("org.osbuild.kickstart", sp.Stages)
Expand All @@ -609,7 +609,7 @@ func TestAnacondaISOTreeSerializeWithContainer(t *testing.T) {
},
}
pipeline.ISOLinux = true
pipeline.serializeStart(nil, []container.Spec{containerPayload}, nil, nil)
pipeline.serializeStart(nil, []container.Spec{containerPayload}, nil, nil, nil)
sp := pipeline.serialize()
pipeline.serializeEnd()
assert.NoError(t, checkISOTreeStages(sp.Stages, append(payloadStages, "org.osbuild.isolinux"), variantStages))
Expand All @@ -620,7 +620,7 @@ func TestAnacondaISOTreeSerializeWithContainer(t *testing.T) {
pipeline := newTestAnacondaISOTree()
pipeline.Kickstart = &kickstart.Options{Path: testKsPath}
pipeline.PayloadRemoveSignatures = true
pipeline.serializeStart(nil, []container.Spec{containerPayload}, nil, nil)
pipeline.serializeStart(nil, []container.Spec{containerPayload}, nil, nil, nil)
sp := pipeline.serialize()
pipeline.serializeEnd()
skopeoStage := findStage("org.osbuild.skopeo", sp.Stages)
Expand Down Expand Up @@ -651,7 +651,7 @@ restorecon -rvF /etc/sudoers.d

func stagesFrom(pipeline Pipeline) []*osbuild.Stage {
containerPayload := makeFakeContainerPayload()
pipeline.serializeStart(nil, []container.Spec{containerPayload}, nil, nil)
pipeline.serializeStart(nil, []container.Spec{containerPayload}, nil, nil, nil)
sp := pipeline.serialize()
pipeline.serializeEnd()
return sp.Stages
Expand Down
2 changes: 1 addition & 1 deletion pkg/manifest/anaconda_installer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func TestAnacondaInstallerModules(t *testing.T) {
installerPipeline.UseLegacyAnacondaConfig = legacy
installerPipeline.AdditionalAnacondaModules = tc.enable
installerPipeline.DisabledAnacondaModules = tc.disable
installerPipeline.serializeStart(pkgs, nil, nil, nil)
installerPipeline.serializeStart(pkgs, nil, nil, nil, nil)
pipeline := installerPipeline.serialize()

require := require.New(t)
Expand Down
4 changes: 2 additions & 2 deletions pkg/manifest/build.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func (p *BuildrootFromPackages) getPackageSpecs() []rpmmd.PackageSpec {
return p.packageSpecs
}

func (p *BuildrootFromPackages) serializeStart(packages []rpmmd.PackageSpec, _ []container.Spec, _ []ostree.CommitSpec, rpmRepos []rpmmd.RepoConfig) {
func (p *BuildrootFromPackages) serializeStart(packages []rpmmd.PackageSpec, _ []container.Spec, _ []ostree.CommitSpec, rpmRepos []rpmmd.RepoConfig, _ []rpmmd.ModuleConfig) {
if len(p.packageSpecs) > 0 {
panic("double call to serializeStart()")
}
Expand Down Expand Up @@ -199,7 +199,7 @@ func (p *BuildrootFromContainer) getContainerSpecs() []container.Spec {
return p.containerSpecs
}

func (p *BuildrootFromContainer) serializeStart(_ []rpmmd.PackageSpec, containerSpecs []container.Spec, _ []ostree.CommitSpec, _ []rpmmd.RepoConfig) {
func (p *BuildrootFromContainer) serializeStart(_ []rpmmd.PackageSpec, containerSpecs []container.Spec, _ []ostree.CommitSpec, _ []rpmmd.RepoConfig, _ []rpmmd.ModuleConfig) {
if len(p.containerSpecs) > 0 {
panic("double call to serializeStart()")
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/manifest/build_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func TestNewBuildFromContainerSpecs(t *testing.T) {
}
// containerSpecs is "nil" until serializeStart populates it
require.Nil(t, build.getContainerSpecs())
build.serializeStart(nil, fakeContainerSpecs, nil, nil)
build.serializeStart(nil, fakeContainerSpecs, nil, nil, nil)
assert.Equal(t, build.getContainerSpecs(), fakeContainerSpecs)

osbuildPipeline := build.serialize()
Expand Down
2 changes: 1 addition & 1 deletion pkg/manifest/commit_server_tree.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func (p *OSTreeCommitServer) getPackageSpecs() []rpmmd.PackageSpec {
return p.packageSpecs
}

func (p *OSTreeCommitServer) serializeStart(packages []rpmmd.PackageSpec, _ []container.Spec, _ []ostree.CommitSpec, rpmRepos []rpmmd.RepoConfig) {
func (p *OSTreeCommitServer) serializeStart(packages []rpmmd.PackageSpec, _ []container.Spec, _ []ostree.CommitSpec, rpmRepos []rpmmd.RepoConfig, _ []rpmmd.ModuleConfig) {
if len(p.packageSpecs) > 0 {
panic("double call to serializeStart()")
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/manifest/coreos_installer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func (p *CoreOSInstaller) getPackageSpecs() []rpmmd.PackageSpec {
return p.packageSpecs
}

func (p *CoreOSInstaller) serializeStart(packages []rpmmd.PackageSpec, _ []container.Spec, _ []ostree.CommitSpec, rpmRepos []rpmmd.RepoConfig) {
func (p *CoreOSInstaller) serializeStart(packages []rpmmd.PackageSpec, _ []container.Spec, _ []ostree.CommitSpec, rpmRepos []rpmmd.RepoConfig, _ []rpmmd.ModuleConfig) {
if len(p.packageSpecs) > 0 {
panic("double call to serializeStart()")
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/manifest/empty.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func (p *ContentTest) getOSTreeCommits() []ostree.CommitSpec {
return p.commitSpecs
}

func (p *ContentTest) serializeStart(pkgs []rpmmd.PackageSpec, containers []container.Spec, commits []ostree.CommitSpec, rpmRepos []rpmmd.RepoConfig) {
func (p *ContentTest) serializeStart(pkgs []rpmmd.PackageSpec, containers []container.Spec, commits []ostree.CommitSpec, rpmRepos []rpmmd.RepoConfig, _ []rpmmd.ModuleConfig) {
if p.serializing {
panic("double call to serializeStart()")
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/manifest/manifest.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ func (m Manifest) Serialize(packageSets map[string][]rpmmd.PackageSpec, containe
inline := make([]string, 0)
containers := make([]container.Spec, 0)
for _, pipeline := range m.pipelines {
pipeline.serializeStart(packageSets[pipeline.Name()], containerSpecs[pipeline.Name()], ostreeCommits[pipeline.Name()], rpmRepos[pipeline.Name()])
pipeline.serializeStart(packageSets[pipeline.Name()], containerSpecs[pipeline.Name()], ostreeCommits[pipeline.Name()], rpmRepos[pipeline.Name()], nil)
}
for _, pipeline := range m.pipelines {
commits = append(commits, pipeline.getOSTreeCommits()...)
Expand Down
6 changes: 5 additions & 1 deletion pkg/manifest/os.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ type OS struct {

// content-related fields
repos []rpmmd.RepoConfig
modules []rpmmd.ModuleConfig
packageSpecs []rpmmd.PackageSpec
containerSpecs []container.Spec
ostreeParentSpec *ostree.CommitSpec
Expand Down Expand Up @@ -376,13 +377,15 @@ func (p *OS) getContainerSpecs() []container.Spec {
return p.containerSpecs
}

func (p *OS) serializeStart(packages []rpmmd.PackageSpec, containers []container.Spec, commits []ostree.CommitSpec, rpmRepos []rpmmd.RepoConfig) {
func (p *OS) serializeStart(packages []rpmmd.PackageSpec, containers []container.Spec, commits []ostree.CommitSpec, rpmRepos []rpmmd.RepoConfig, modules []rpmmd.ModuleConfig) {
if len(p.packageSpecs) > 0 {
panic("double call to serializeStart()")
}

p.packageSpecs = packages
p.containerSpecs = containers
p.modules = modules

if len(commits) > 0 {
if len(commits) > 1 {
panic("pipeline supports at most one ostree commit")
Expand All @@ -404,6 +407,7 @@ func (p *OS) serializeEnd() {
p.kernelVer = ""
p.packageSpecs = nil
p.containerSpecs = nil
p.modules = nil
p.ostreeParentSpec = nil
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/manifest/os_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func NewTestOS() *OS {
packages := []rpmmd.PackageSpec{
{Name: "pkg1", Checksum: "sha1:c02524e2bd19490f2a7167958f792262754c5f46"},
}
os.serializeStart(packages, nil, nil, repos)
os.serializeStart(packages, nil, nil, repos, nil)

return os
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/manifest/ostree_deployment.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func (p *OSTreeDeployment) getContainerSources() []container.SourceSpec {
}
}

func (p *OSTreeDeployment) serializeStart(_ []rpmmd.PackageSpec, containers []container.Spec, commits []ostree.CommitSpec, _ []rpmmd.RepoConfig) {
func (p *OSTreeDeployment) serializeStart(_ []rpmmd.PackageSpec, containers []container.Spec, commits []ostree.CommitSpec, _ []rpmmd.RepoConfig, _ []rpmmd.ModuleConfig) {
if p.ostreeSpec != nil || p.containerSpec != nil {
panic("double call to serializeStart()")
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/manifest/pipeline.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ type Pipeline interface {
// its full Spec. See the ostree package for more details.
getOSTreeCommitSources() []ostree.SourceSpec

serializeStart([]rpmmd.PackageSpec, []container.Spec, []ostree.CommitSpec, []rpmmd.RepoConfig)
serializeStart([]rpmmd.PackageSpec, []container.Spec, []ostree.CommitSpec, []rpmmd.RepoConfig, []rpmmd.ModuleConfig)
serializeEnd()
serialize() osbuild.Pipeline

Expand Down Expand Up @@ -166,7 +166,7 @@ func NewBase(name string, build Build) Base {

// serializeStart must be called exactly once before each call
// to serialize().
func (p Base) serializeStart([]rpmmd.PackageSpec, []container.Spec, []ostree.CommitSpec, []rpmmd.RepoConfig) {
func (p Base) serializeStart([]rpmmd.PackageSpec, []container.Spec, []ostree.CommitSpec, []rpmmd.RepoConfig, []rpmmd.ModuleConfig) {
}

// serializeEnd must be called exactly once after each call to
Expand Down
2 changes: 1 addition & 1 deletion pkg/manifest/raw_bootc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func (p *RawBootcImage) getContainerSpecs() []container.Spec {
return p.containerSpecs
}

func (p *RawBootcImage) serializeStart(_ []rpmmd.PackageSpec, containerSpecs []container.Spec, _ []ostree.CommitSpec, _ []rpmmd.RepoConfig) {
func (p *RawBootcImage) serializeStart(_ []rpmmd.PackageSpec, containerSpecs []container.Spec, _ []ostree.CommitSpec, _ []rpmmd.RepoConfig, _ []rpmmd.ModuleConfig) {
if len(p.containerSpecs) > 0 {
panic("double call to serializeStart()")
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/manifest/raw_bootc_export_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ func (rbc *RawBootcImage) Serialize() osbuild.Pipeline {
}

func (rbc *RawBootcImage) SerializeStart(a []rpmmd.PackageSpec, b []container.Spec, c []ostree.CommitSpec, r []rpmmd.RepoConfig) {
rbc.serializeStart(a, b, c, r)
rbc.serializeStart(a, b, c, r, nil)
}

0 comments on commit 0469265

Please sign in to comment.