Patches integration tests with Makefile

cmoog · cmoog · commit 5fd299269005 · 2020-12-10T03:08:34.000Z
diff --git a/ci/integration/Dockerfile b/ci/integration/Dockerfile
@@ -1,3 +1,3 @@
 FROM ubuntu:20.04
 
-RUN apt-get update && apt-get install -y jq curl
+RUN apt-get update && apt-get install -y jq curl build-essential
diff --git a/ci/integration/setup_test.go b/ci/integration/setup_test.go
@@ -37,7 +37,7 @@ func build(path string) error {
 	cmd := exec.Command(
 		"sh", "-c",
 		fmt.Sprintf(
-			"cd ../../ && mkdir -p %s && ./ci/steps/build.sh && cp ./ci/bin/%s %s/ && tar -xzf %s -C %s",
+			"cd ../../ && mkdir -p %s && make build/linux && cp ./ci/bin/%s %s/ && tar -xzf %s -C %s",
 			dir, tar, dir, filepath.Join(dir, tar), dir),
 	)
 
diff --git a/pkg/tcli/tcli.go b/pkg/tcli/tcli.go
@@ -67,7 +67,7 @@ func NewContainerRunner(ctx context.Context, config *ContainerConfig) (*Containe
 		"run",
 		"--name", config.Name,
 		"--network", "host",
-		"-it", "-d",
+		"--rm", "-it", "-d",
 	}
 	args = append(args, mountArgs(config.BindMounts)...)
 	args = append(args, config.Image)

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`FROM ubuntu:20.04`
`2`	`2`
`3`		`-RUN apt-get update && apt-get install -y jq curl`
	`3`	`+RUN apt-get update && apt-get install -y jq curl build-essential`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func build(path string) error {`
`37`	`37`	`cmd := exec.Command(`
`38`	`38`	`"sh", "-c",`
`39`	`39`	`fmt.Sprintf(`
`40`		`- "cd ../../ && mkdir -p %s && ./ci/steps/build.sh && cp ./ci/bin/%s %s/ && tar -xzf %s -C %s",`
	`40`	`+ "cd ../../ && mkdir -p %s && make build/linux && cp ./ci/bin/%s %s/ && tar -xzf %s -C %s",`
`41`	`41`	`dir, tar, dir, filepath.Join(dir, tar), dir),`
`42`	`42`	`)`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func NewContainerRunner(ctx context.Context, config ContainerConfig) (Containe`
`67`	`67`	`"run",`
`68`	`68`	`"--name", config.Name,`
`69`	`69`	`"--network", "host",`
`70`		`- "-it", "-d",`
	`70`	`+ "--rm", "-it", "-d",`
`71`	`71`	`}`
`72`	`72`	`args = append(args, mountArgs(config.BindMounts)...)`
`73`	`73`	`args = append(args, config.Image)`