diff --git a/docs/website/docs/overview/configure.md b/docs/website/docs/overview/configure.md index 4188e5fd2c5..df853a39d13 100644 --- 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`. \ No newline at end of file diff --git a/tests/helper/helper_podman.go b/tests/helper/helper_podman.go index 6bc1a837845..22a27c19e76 100644 --- a/tests/helper/helper_podman.go +++ b/tests/helper/helper_podman.go @@ -7,13 +7,27 @@ import ( "os/exec" "path/filepath" "regexp" + "strconv" "strings" . "github.com/onsi/gomega" "github.com/redhat-developer/odo/pkg/podman" ) +func getBooleanValueFromEnvVar(envvar string, defaultValue bool) bool { + strVal := os.Getenv("PODMAN_USE_NAMESPACES") + boolValue, err := strconv.ParseBool(strVal) + if err != nil { + return defaultValue + } + return boolValue +} + func GenerateAndSetContainersConf(dir string) { + useNamespaces := getBooleanValueFromEnvVar("PODMAN_USE_NAMESPACES", true) + if !useNamespaces { + return + } ns := GetProjectName() containersConfPath := filepath.Join(dir, "containers.conf") err := CreateFileWithContent(containersConfPath, fmt.Sprintf(`