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

osbuildexecutor: write the job-id intro control.json

Browse source 
Set the jobID into control.json so that the osbuild-worker-executor
can set the hostname based on the jobID.
This commit is contained in:
Michael Vogt 2024-06-13 17:12:36 +02:00
parent aa3d70a429
commit c13d37c3c0
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/osbuildexecutor/runner-impl-aws-ec2_test.go
View file

@ -46,7 +46,7 @@ func TestWriteInputArchive(t *testing.T) {
require.NoError(t, os.WriteFile(filepath.Join(storeDir, "contents"), []byte("storedata"), 0600))
require.NoError(t, os.WriteFile(filepath.Join(storeSubDir, "contents"), []byte("storedata"), 0600))
archive, err := osbuildexecutor.WriteInputArchive(cacheDir, storeDir, []string{"image"}, []byte("{\"version\": 2}"))
archive, err := osbuildexecutor.WriteInputArchive(cacheDir, storeDir, "some-job-id", []string{"image"}, []byte("{\"version\": 2}"))
require.NoError(t, err)
cmd := exec.Command("tar",
@ -64,6 +64,10 @@ func TestWriteInputArchive(t *testing.T) {
"store/contents",
"",
}, strings.Split(string(out), "\n"))
output, err := exec.Command("tar", "xOf", archive, "control.json").CombinedOutput()
require.NoError(t, err)
require.Equal(t, `{"exports":["image"],"job-id":"some-job-id"}`, string(output))
}
func TestHandleBuild(t *testing.T) {