From 8753180a80e03dd031fa7f470adbcbb4a611d1c9 Mon Sep 17 00:00:00 2001 From: Maros Ondrejicka Date: Mon, 19 Dec 2022 20:35:27 +0100 Subject: hs-test: add runtime options Options "-p" to not remove topology elements after the test finishes "-v" from now on extra output from tests is hidden by default, this will show it again Type: test Signed-off-by: Maros Ondrejicka Change-Id: I626188561c883534e9004d5130ee2a972d12b4e2 --- extras/hs-test/container.go | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'extras/hs-test/container.go') diff --git a/extras/hs-test/container.go b/extras/hs-test/container.go index 1dc65fff308..5aa5e4795e8 100644 --- a/extras/hs-test/container.go +++ b/extras/hs-test/container.go @@ -71,19 +71,23 @@ func NewContainer(yamlInput ContainerConfig) (*Container, error) { return container, nil } -func (c *Container) run() error { - if c.name == "" { - return fmt.Errorf("create volume failed: container name is blank") - } - - exechelper.Run(fmt.Sprintf("mkdir -p /tmp/%s/sync", c.name)) +func (c *Container) getRunCommand() string { syncPath := fmt.Sprintf(" -v %s:/tmp/sync", c.getSyncPath()) cmd := "docker run --cap-add=all -d --privileged --network host --rm" cmd += syncPath cmd += c.getVolumesAsCliOption() cmd += c.getEnvVarsAsCliOption() cmd += " --name " + c.name + " " + c.image - fmt.Println(cmd) + return cmd +} + +func (c *Container) run() error { + if c.name == "" { + return fmt.Errorf("run container failed: name is blank") + } + + exechelper.Run(fmt.Sprintf("mkdir -p /tmp/%s/sync", c.name)) + cmd := c.getRunCommand() err := exechelper.Run(cmd) if err != nil { return fmt.Errorf("container run failed: %s", err) -- cgit 1.2.3-korg