Skip to content

Commit

Permalink
fix(build): add cup to path in base for integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
GeorgeMac committed Aug 22, 2023
1 parent 9621e4f commit a677136
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build/build/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ func Variant(client *dagger.Client, base *dagger.Container, platform dagger.Plat
return client.
Container(dagger.ContainerOpts{Platform: platform}).
From("alpine:3.18").
WithExec([]string{"mkdir", "-p", "/var/run/cupd"}).
WithExec([]string{"mkdir", "-p", "/var/run/cupd", "/etc/cupd/config"}).
WithWorkdir("/var/run/cupd").
WithFile("/usr/local/bin/cupd", base.File(path.Join(binDir, "cupd"))).
WithFile("/usr/local/bin/cup", base.File(path.Join(binDir, "cup"))).
Expand Down
13 changes: 12 additions & 1 deletion build/testing/testing.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,25 @@ package testing

import (
"context"
"fmt"
"time"

"dagger.io/dagger"
"github.com/containerd/containerd/platforms"
"go.flipt.io/cup/build/testing/integration"
)

func Integration(ctx context.Context, client *dagger.Client, base, cupd *dagger.Container) error {
base = base.WithWorkdir("build/testing/template")
platform, err := client.DefaultPlatform(ctx)
if err != nil {
return err
}

p := platforms.MustParse(string(platform))

base = base.WithFile("/usr/local/bin/cup", base.File(fmt.Sprintf("bin/%s/%s/cup", p.OS, p.Architecture))).
WithWorkdir("build/testing/template")

cupd = cupd.WithMountedDirectory("/etc/cupd/config", base.Directory("testdata/config"))

{
Expand Down

0 comments on commit a677136

Please sign in to comment.