Merge pull request #1300 from TomChv/europa/plan-platform-configuration

Config platform in #Plan
This commit is contained in:
Andrea Luzzardi 2021-12-23 16:48:26 +01:00 committed by GitHub
commit bbec566bb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 142 additions and 0 deletions

View File

@ -48,6 +48,10 @@ func Load(ctx context.Context, args ...string) (*Plan, error) {
return nil, err return nil, err
} }
if err := p.configPlatform(); err != nil {
return nil, err
}
return p, nil return p, nil
} }
@ -59,6 +63,31 @@ func (p *Plan) Source() *compiler.Value {
return p.source return p.source
} }
// configPlatform load the platform specified in the context
// Buildkit will then run every operation using that platform
// If platform is not define, context keep default platform
func (p *Plan) configPlatform() error {
platformField := p.source.Lookup("platform")
// Ignore if platform is not set in `#Plan`
if !platformField.Exists() {
return nil
}
// Convert platform to string
platform, err := platformField.String()
if err != nil {
return err
}
// Set platform to context
err = p.context.Platform.Set(platform)
if err != nil {
return err
}
return nil
}
// registerLocalDirectories scans the context for local imports. // registerLocalDirectories scans the context for local imports.
// BuildKit requires to known the list of directories ahead of time. // BuildKit requires to known the list of directories ahead of time.
func (p *Plan) registerLocalDirs() error { func (p *Plan) registerLocalDirs() error {

View File

@ -27,6 +27,9 @@ package engine
// Forward network services to and from the client // Forward network services to and from the client
proxy: [endpoint=string]: _#proxyEndpoint proxy: [endpoint=string]: _#proxyEndpoint
// Configure platform execution
platform?: string
// Execute actions in containers // Execute actions in containers
actions: { actions: {
... ...

View File

@ -77,3 +77,17 @@ setup() {
"$DAGGER" --europa up ./outputs.cue "$DAGGER" --europa up ./outputs.cue
assert [ -f "./out/test" ] assert [ -f "./out/test" ]
} }
@test "plan/platform" {
cd "$TESTDIR"
# Run with amd64 platform
run "$DAGGER" --europa up ./plan/platform/config_platform_linux_amd64.cue
# Run with arm64 platform
run "$DAGGER" --europa up ./plan/platform/config_platform_linux_arm64.cue
# Run with invalid platform
run "$DAGGER" --europa up ./plan/platform/config_platform_failure_invalid_platform.cue
assert_failure
}

View File

@ -0,0 +1,32 @@
package main
import (
"alpha.dagger.io/europa/dagger/engine"
)
engine.#Plan & {
platform: "linux/unknown"
actions: {
image: engine.#Pull & {
source: "alpine:3.15.0"
}
writeArch: engine.#Exec & {
input: image.output
always: true
args: [
"sh", "-c", #"""
echo -n $(uname -m) >> /arch.txt
"""#,
]
}
verify: engine.#ReadFile & {
input: writeArch.output
path: "/arch.txt"
} & {
contents: "s390x"
}
}
}

View File

@ -0,0 +1,32 @@
package main
import (
"alpha.dagger.io/europa/dagger/engine"
)
engine.#Plan & {
platform: "linux/amd64"
actions: {
image: engine.#Pull & {
source: "alpine:3.15.0"
}
writeArch: engine.#Exec & {
input: image.output
always: true
args: [
"sh", "-c", #"""
echo -n $(uname -m) >> /arch.txt
"""#,
]
}
verify: engine.#ReadFile & {
input: writeArch.output
path: "/arch.txt"
} & {
contents: "x86_64"
}
}
}

View File

@ -0,0 +1,32 @@
package main
import (
"alpha.dagger.io/europa/dagger/engine"
)
engine.#Plan & {
platform: "linux/arm64"
actions: {
image: engine.#Pull & {
source: "alpine:3.15.0"
}
writeArch: engine.#Exec & {
input: image.output
always: true
args: [
"sh", "-c", #"""
echo -n $(uname -m) >> /arch.txt
"""#,
]
}
verify: engine.#ReadFile & {
input: writeArch.output
path: "/arch.txt"
} & {
contents: "aarch64"
}
}
}