Skip to content

K
k3s
Commit 7a91f6eb authored by Derek Nola's avatar Derek Nola
Browse files
Options

assign GOCOVERDIR in docker tests

Signed-off-by: 's avatarDerek Nola <derek.nola@suse.com>
parent f4062557
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
tests/docker/test-helpers.go
View file @ 7a91f6eb
...@@ -150,6 +150,7 @@ func (config *TestConfig) ProvisionServers(numOfServers int) error { ...@@ -150,6 +150,7 @@ func (config *TestConfig) ProvisionServers(numOfServers int) error {
"--memory", "2048m", "--memory", "2048m",
"-e", fmt.Sprintf("K3S_TOKEN=%s", config.Token), "-e", fmt.Sprintf("K3S_TOKEN=%s", config.Token),
"-e", "K3S_DEBUG=true", "-e", "K3S_DEBUG=true",
"-e", "GOCOVERDIR=/tmp/k3s-cov",
"-v", "/sys/fs/bpf:/sys/fs/bpf", "-v", "/sys/fs/bpf:/sys/fs/bpf",
"-v", "/lib/modules:/lib/modules", "-v", "/lib/modules:/lib/modules",
"-v", "/var/run/docker.sock:/var/run/docker.sock", "-v", "/var/run/docker.sock:/var/run/docker.sock",
...@@ -162,10 +163,14 @@ func (config *TestConfig) ProvisionServers(numOfServers int) error { ...@@ -162,10 +163,14 @@ func (config *TestConfig) ProvisionServers(numOfServers int) error {
return fmt.Errorf("failed to start systemd container: %s: %v", out, err) return fmt.Errorf("failed to start systemd container: %s: %v", out, err)
} }
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
cmd := "mkdir -p /tmp/k3s-cov"
if out, err := newServer.RunCmdOnNode(cmd); err != nil {
return fmt.Errorf("failed to create coverage directory: %s: %v", out, err)
}
// The pipe requires that we use sh -c with "" to run the command // The pipe requires that we use sh -c with "" to run the command
sCmd := fmt.Sprintf("/bin/sh -c \"curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC='%s' INSTALL_K3S_SKIP_DOWNLOAD=true sh -\"", cmd = fmt.Sprintf("/bin/sh -c \"curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC='%s' INSTALL_K3S_SKIP_DOWNLOAD=true sh -\"",
joinOrStart+" "+os.Getenv(fmt.Sprintf("SERVER_%d_ARGS", i))) joinOrStart+" "+os.Getenv(fmt.Sprintf("SERVER_%d_ARGS", i)))
if out, err := newServer.RunCmdOnNode(sCmd); err != nil { if out, err := newServer.RunCmdOnNode(cmd); err != nil {
return fmt.Errorf("failed to start server: %s: %v", out, err) return fmt.Errorf("failed to start server: %s: %v", out, err)
} }
} else { } else {
...@@ -178,6 +183,7 @@ func (config *TestConfig) ProvisionServers(numOfServers int) error { ...@@ -178,6 +183,7 @@ func (config *TestConfig) ProvisionServers(numOfServers int) error {
"-p", "6443", "-p", "6443",
"-e", fmt.Sprintf("K3S_TOKEN=%s", config.Token), "-e", fmt.Sprintf("K3S_TOKEN=%s", config.Token),
"-e", "K3S_DEBUG=true", "-e", "K3S_DEBUG=true",
"-e", "GOCOVERDIR=/tmp/",
os.Getenv("SERVER_DOCKER_ARGS"), os.Getenv("SERVER_DOCKER_ARGS"),
os.Getenv(fmt.Sprintf("SERVER_%d_DOCKER_ARGS", i)), os.Getenv(fmt.Sprintf("SERVER_%d_DOCKER_ARGS", i)),
os.Getenv("REGISTRY_CLUSTER_ARGS"), os.Getenv("REGISTRY_CLUSTER_ARGS"),
...@@ -266,6 +272,7 @@ func (config *TestConfig) ProvisionAgents(numOfAgents int) error { ...@@ -266,6 +272,7 @@ func (config *TestConfig) ProvisionAgents(numOfAgents int) error {
"--privileged", "--privileged",
"-e", fmt.Sprintf("K3S_TOKEN=%s", config.Token), "-e", fmt.Sprintf("K3S_TOKEN=%s", config.Token),
"-e", fmt.Sprintf("K3S_URL=%s", k3sURL), "-e", fmt.Sprintf("K3S_URL=%s", k3sURL),
"-e", "GOCOVERDIR=/tmp/",
os.Getenv("AGENT_DOCKER_ARGS"), os.Getenv("AGENT_DOCKER_ARGS"),
os.Getenv(fmt.Sprintf("AGENT_%d_DOCKER_ARGS", i)), os.Getenv(fmt.Sprintf("AGENT_%d_DOCKER_ARGS", i)),
os.Getenv("REGISTRY_CLUSTER_ARGS"), os.Getenv("REGISTRY_CLUSTER_ARGS"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment