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

aws.ec2: prep sources before starting build

Browse source
This commit is contained in:
Sanne Raymaekers 2024-03-01 16:49:49 +01:00
parent b4e361e093
commit 56bdcf1cdc
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,8 +18,20 @@ type awsEC2Executor struct {
cloudWatchGroup string cloudWatchGroup string
} }
func prepareSources(manifest []byte, store string, result bool, errorWriter io.Writer) error {
hostExecutor := NewHostExecutor()
_, err := hostExecutor.RunOSBuild(manifest, store, "", nil, nil, nil, nil, result, errorWriter)
return err
}
func (ec2e *awsEC2Executor) RunOSBuild(manifest []byte, store, outputDirectory string, exports, exportPaths, checkpoints, func (ec2e *awsEC2Executor) RunOSBuild(manifest []byte, store, outputDirectory string, exports, exportPaths, checkpoints,
extraEnv []string, result bool, errorWriter io.Writer) (*osbuild.Result, error) { extraEnv []string, result bool, errorWriter io.Writer) (*osbuild.Result, error) {
err := prepareSources(manifest, store, result, errorWriter)
if err != nil {
return nil, err
}
region, err := awscloud.RegionFromInstanceMetadata() region, err := awscloud.RegionFromInstanceMetadata()
if err != nil { if err != nil {
return nil, err return nil, err
@ -45,6 +57,8 @@ func (ec2e *awsEC2Executor) RunOSBuild(manifest []byte, store, outputDirectory s
args := []string{ args := []string{
"--builder-host", "--builder-host",
*si.Instance.PrivateIpAddress, *si.Instance.PrivateIpAddress,
"--store",
store,
} }
for _, exp := range exports { for _, exp := range exports {