Merge 3f2f244 into b57d3e2

redhat-developer · Apr 26, 2023 · 1468667 · 1468667
2 parents b57d3e2 + 3f2f244
commit 1468667
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/docs/website/docs/overview/configure.md b/docs/website/docs/overview/configure.md
@@ -191,5 +191,7 @@ Options here are mostly used for debugging and testing `odo` behavior.
 | `TELEMETRY_CALLER`         | Caller identifier passed to [telemetry](https://github.com/redhat-developer/odo/blob/main/USAGE_DATA.md). Case-insensitive. Acceptable values: `vscode`, `intellij`, `jboss`.                                                                                                                                                                                                  | v3.1.0        | `intellij`                      |
 | `ODO_TRACKING_CONSENT`     | Useful for controlling [telemetry](https://github.com/redhat-developer/odo/blob/main/USAGE_DATA.md). Acceptable values: `yes` ([enables telemetry](https://github.com/redhat-developer/odo/blob/main/USAGE_DATA.md) and skips consent prompt), `no` (disables telemetry and consent prompt). Takes precedence over the [`ConsentTelemetry`](#preference-key-table) preference. | v3.2.0        | `yes`                           |
 | `ODO_PUSH_IMAGES`          | Whether to push the images once built; this is used only when applying Devfile image components as part of a Dev Session running on Podman; this is useful for integration tests running on Podman. `true` by default                                                                                                                     | v3.7.0        | `false`                         |
+| `PODMAN_USE_NAMESPACES`          | Whether to isolate pods on namespaces when running integration tests on Podman. `true` by default                                                                                                                     | v3.10.0        | `false`                         |
+
 
 (1) Accepted boolean values are: `1`, `t`, `T`, `TRUE`, `true`, `True`, `0`, `f`, `F`, `FALSE`, `false`, `False`.
diff --git a/tests/helper/helper_podman.go b/tests/helper/helper_podman.go
@@ -14,6 +14,9 @@ import (
 )
 
 func GenerateAndSetContainersConf(dir string) {
+	if os.Getenv("PODMAN_USE_NAMESPACES") == "false" {
+		return
+	}
 	ns := GetProjectName()
 	containersConfPath := filepath.Join(dir, "containers.conf")
 	err := CreateFileWithContent(containersConfPath, fmt.Sprintf(`