summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaros Ondrejicka <maros.ondrejicka@pantheon.tech>2022-10-13 15:38:17 +0200
committerMaros O <maros.ondrejicka@pantheon.tech>2022-10-13 13:54:25 +0000
commiteeaf6c8973d5dde96612e0212137408675fadf7a (patch)
tree90ac80670aebff9641a7e12686097fbd670b7344
parentce62d6f01ceb9373d64110e6e4cfab7dcc041e9b (diff)
misc: avoid permission issue when running envoy
Because envoy didn't have permission for `envoy.log` file it would stop. This made tests involving envoy fail. Adding `ENVOY_UID` environment variable makes envoy run as root, which avoids the problem. Type: fix Signed-off-by: Maros Ondrejicka <maros.ondrejicka@pantheon.tech> Change-Id: I910416ad1c87137396e7da89c13de7739ce74c70
-rw-r--r--.gitignore4
-rwxr-xr-xextras/hs-test/utils.go3
2 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index aba513c91e5..be94f092580 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,3 +123,7 @@ compile_commands.json
# No test log files
**/test-run-*-*-*
+# host stack test framework
+/extras/hs-test/vpp-data
+/extras/hs-test/hs-test
+/extras/hs-test/http_server
diff --git a/extras/hs-test/utils.go b/extras/hs-test/utils.go
index 25303591a43..ba40beedeaf 100755
--- a/extras/hs-test/utils.go
+++ b/extras/hs-test/utils.go
@@ -207,6 +207,7 @@ func startEnvoy(ctx context.Context, dockerInstance string) <-chan error {
"-v", fmt.Sprintf("%s/envoy/proxy.yaml:/etc/envoy/envoy.yaml", wd),
"-v", fmt.Sprintf("shared-vol:/tmp/%s", dockerInstance),
"-v", fmt.Sprintf("%s/envoy:/tmp", wd),
+ "-e", "ENVOY_UID=0",
"-e", "VCL_CONFIG=/tmp/vcl.conf",
"envoyproxy/envoy-contrib:v1.21-latest"}
fmt.Println(c)
@@ -221,7 +222,7 @@ func startEnvoy(ctx context.Context, dockerInstance string) <-chan error {
break
}
if count > 5 {
- errCh <- fmt.Errorf("Failed to start envoy docker after %d attempts", count)
+ errCh <- fmt.Errorf("failed to start envoy docker after %d attempts", count)
return
}
}