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

Revert "osbuildexecutor: write the job-id intro control.json"

Browse source 
This reverts commit c13d37c3c0.
This commit is contained in:
Sanne Raymaekers 2024-06-20 13:43:01 +02:00
parent 4853bf3ec0
commit 14052e25db
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -73,17 +73,15 @@ func waitForSI(ctx context.Context, host string) bool {
} }
} }
func writeInputArchive(cacheDir, store, jobID string, exports []string, manifestData []byte) (string, error) { func writeInputArchive(cacheDir, store string, exports []string, manifestData []byte) (string, error) {
archive := filepath.Join(cacheDir, "input.tar") archive := filepath.Join(cacheDir, "input.tar")
control := filepath.Join(cacheDir, "control.json") control := filepath.Join(cacheDir, "control.json")
manifest := filepath.Join(cacheDir, "manifest.json") manifest := filepath.Join(cacheDir, "manifest.json")
controlData := struct { controlData := struct {
Exports []string `json:"exports"` Exports []string `json:"exports"`
JobID string `json:"job-id"`
}{ }{
Exports: exports, Exports: exports,
JobID: jobID,
} }
controlDataBytes, err := json.Marshal(controlData) controlDataBytes, err := json.Marshal(controlData)
if err != nil { if err != nil {
@ -289,7 +287,7 @@ func (ec2e *awsEC2Executor) RunOSBuild(manifest []byte, opts *OsbuildOpts, error
return nil, fmt.Errorf("Timeout waiting for executor to come online") return nil, fmt.Errorf("Timeout waiting for executor to come online")
} }
inputArchive, err := writeInputArchive(ec2e.tmpDir, opts.StoreDir, opts.JobID, opts.Exports, manifest) inputArchive, err := writeInputArchive(ec2e.tmpDir, opts.StoreDir, opts.Exports, manifest)
if err != nil { if err != nil {
logrus.Errorf("Unable to write input archive: %v", err) logrus.Errorf("Unable to write input archive: %v", err)
return nil, err return nil, err

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