particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move qemuStageInputs() from distros to osbuild2

Browse source 
Move the `qemuStageInputs()` function duplicated in most
distro definitions to the `osbuild2` package as
`NewQemuStagePipelineFilesInputs()`.

Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
Tomas Hozza 2022-02-16 10:14:36 +01:00 • committed by Ondřej Budai
parent 71ae94b40f
commit 0bd0f57231
9 changed files with 18 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/distro/rhel85/pipelines.go
View file

@ -1316,7 +1316,7 @@ func qemuPipeline(inputPipelineName, inputFilename, outputFilename, format, qcow
p.Name = format
p.Build = "name:build"
qemuStage := osbuild.NewQEMUStage(qemuStageOptions(outputFilename, format, qcow2Compat), qemuStageInputs(inputPipelineName, inputFilename))
qemuStage := osbuild.NewQEMUStage(qemuStageOptions(outputFilename, format, qcow2Compat), osbuild.NewQemuStagePipelineFilesInputs(inputPipelineName, inputFilename))
p.AddStage(qemuStage)
return p
}

14
internal/distro/rhel85/stage_inputs.go
View file

@ -41,17 +41,3 @@ func ostreePullStageInputs(origin, source, commitRef string) *osbuild.OSTreePull
pullStageInput.References = inputRefs
return &osbuild.OSTreePullStageInputs{Commits: pullStageInput}
}
func qemuStageInputs(stage, file string) *osbuild.QEMUStageInputs {
stageKey := "name:" + stage
ref := map[string]osbuild.QEMUFile{
stageKey: {
File: file,
},
}
input := new(osbuild.QEMUStageInput)
input.Type = "org.osbuild.files"
input.Origin = "org.osbuild.pipeline"
input.References = ref
return &osbuild.QEMUStageInputs{Image: input}
}

2
internal/distro/rhel86/pipelines.go
View file

@ -1039,7 +1039,7 @@ func qemuPipeline(inputPipelineName, inputFilename, outputFilename, format, qcow
p.Name = format
p.Build = "name:build"
qemuStage := osbuild.NewQEMUStage(qemuStageOptions(outputFilename, format, qcow2Compat), qemuStageInputs(inputPipelineName, inputFilename))
qemuStage := osbuild.NewQEMUStage(qemuStageOptions(outputFilename, format, qcow2Compat), osbuild.NewQemuStagePipelineFilesInputs(inputPipelineName, inputFilename))
p.AddStage(qemuStage)
return p
}

14
internal/distro/rhel86/stage_inputs.go
View file

@ -41,17 +41,3 @@ func ostreePullStageInputs(origin, source, commitRef string) *osbuild.OSTreePull
pullStageInput.References = inputRefs
return &osbuild.OSTreePullStageInputs{Commits: pullStageInput}
}
func qemuStageInputs(stage, file string) *osbuild.QEMUStageInputs {
stageKey := "name:" + stage
ref := map[string]osbuild.QEMUFile{
stageKey: {
File: file,
},
}
input := new(osbuild.QEMUStageInput)
input.Type = "org.osbuild.files"
input.Origin = "org.osbuild.pipeline"
input.References = ref
return &osbuild.QEMUStageInputs{Image: input}
}

2
internal/distro/rhel90/pipelines.go
View file

@ -1036,7 +1036,7 @@ func qemuPipeline(inputPipelineName, inputFilename, outputFilename, format, qcow
p.Name = format
p.Build = "name:build"
qemuStage := osbuild.NewQEMUStage(qemuStageOptions(outputFilename, format, qcow2Compat), qemuStageInputs(inputPipelineName, inputFilename))
qemuStage := osbuild.NewQEMUStage(qemuStageOptions(outputFilename, format, qcow2Compat), osbuild.NewQemuStagePipelineFilesInputs(inputPipelineName, inputFilename))
p.AddStage(qemuStage)
return p
}

14
internal/distro/rhel90/stage_inputs.go
View file

@ -41,17 +41,3 @@ func ostreePullStageInputs(origin, source, commitRef string) *osbuild.OSTreePull
pullStageInput.References = inputRefs
return &osbuild.OSTreePullStageInputs{Commits: pullStageInput}
}
func qemuStageInputs(stage, file string) *osbuild.QEMUStageInputs {
stageKey := "name:" + stage
ref := map[string]osbuild.QEMUFile{
stageKey: {
File: file,
},
}
input := new(osbuild.QEMUStageInput)
input.Type = "org.osbuild.files"
input.Origin = "org.osbuild.pipeline"
input.References = ref
return &osbuild.QEMUStageInputs{Image: input}
}

2
internal/distro/rhel90beta/pipelines.go
View file

@ -1126,7 +1126,7 @@ func qemuPipeline(inputPipelineName, inputFilename, outputFilename, format, qcow
p.Name = format
p.Build = "name:build"
qemuStage := osbuild.NewQEMUStage(qemuStageOptions(outputFilename, format, qcow2Compat), qemuStageInputs(inputPipelineName, inputFilename))
qemuStage := osbuild.NewQEMUStage(qemuStageOptions(outputFilename, format, qcow2Compat), osbuild.NewQemuStagePipelineFilesInputs(inputPipelineName, inputFilename))
p.AddStage(qemuStage)
return p
}

14
internal/distro/rhel90beta/stage_inputs.go
View file

@ -41,17 +41,3 @@ func ostreePullStageInputs(origin, source, commitRef string) *osbuild.OSTreePull
pullStageInput.References = inputRefs
return &osbuild.OSTreePullStageInputs{Commits: pullStageInput}
}
func qemuStageInputs(stage, file string) *osbuild.QEMUStageInputs {
stageKey := "name:" + stage
ref := map[string]osbuild.QEMUFile{
stageKey: {
File: file,
},
}
input := new(osbuild.QEMUStageInput)
input.Type = "org.osbuild.files"
input.Origin = "org.osbuild.pipeline"
input.References = ref
return &osbuild.QEMUStageInputs{Image: input}
}

14
internal/osbuild2/qemu_stage.go
View file

@ -105,3 +105,17 @@ func (options QEMUStageOptions) MarshalJSON() ([]byte, error) {
return json.Marshal(qemuStageOptions(options))
}
func NewQemuStagePipelineFilesInputs(stage, file string) *QEMUStageInputs {
stageKey := "name:" + stage
ref := map[string]QEMUFile{
stageKey: {
File: file,
},
}
input := new(QEMUStageInput)
input.Type = "org.osbuild.files"
input.Origin = "org.osbuild.pipeline"
input.References = ref
return &QEMUStageInputs{Image: input}
}