chore(test): fix postcleanup precheck (#2328)

- rename POST_CLEANUP to POST_CLEANUP_PRECHECK to control precheck execution
- POST_CLEANUP now only controls cleanup behavior (validated by precheck)
- remove duplicate validation from legacy package
- add PostCleanupEnv constant in config package
- update README with valid POST_CLEANUP values

Signed-off-by: Roman Sysoev <roman.sysoev@flant.com>

Author: hardcoretime

test/e2e/README.md

@@ -101,14 +101,18 @@ FOCUS="VirtualMachineConnectivity" POST_CLEANUP=no task run
 
 ### PostCleanUp option
 
-POST_CLEANUP defines an environment variable used to explicitly request the deletion of created/used resources.
+`POST_CLEANUP` defines an environment variable used to explicitly request the deletion of created/used resources.
+
+Valid values:
+- `yes` or "" (empty) - perform cleanup after tests (default)
+- `no` - skip cleanup after tests
 
 You can also control cleanup behavior via the `isCleanupNeeded` field in `default_config.yaml`:
 ```yaml
 isCleanupNeeded: true  # default: cleanup enabled
 ```
 
-The POST_CLEANUP environment variable takes precedence over the YAML config.
+The `POST_CLEANUP` environment variable takes precedence over the YAML config.
 
 For example, run a test in no-cleanup mode:
 ```bash

test/e2e/internal/config/cleanup.go

@@ -18,19 +18,19 @@ package config
 
 import (
 	"fmt"
-	"log"
 	"os"
 )
 
-// PostCleanUpEnv defines an environment variable used to explicitly request the deletion of created/used resources.
-const PostCleanUpEnv = "POST_CLEANUP"
-
 // PrecreatedCVICleanupEnv defines an environment variable to explicitly enable deletion of precreated CVIs after the suite.
 //
 // By default, precreated CVIs are not deleted: they are shared across runs and may be reused.
 // Set PRECREATED_CVI_CLEANUP=yes to delete them after the suite; unset, empty, or "no" means no deletion.
 const PrecreatedCVICleanupEnv = "PRECREATED_CVI_CLEANUP"
 
+// PostCleanupEnv defines an environment variable used to explicitly request the deletion of created/used resources.
+// Valid values: "yes", "no", or "" (default = yes).
+const PostCleanupEnv = "POST_CLEANUP"
+
 func CheckPrecreatedCVICleanupOption() error {
 	env := os.Getenv(PrecreatedCVICleanupEnv)
 	switch env {
@@ -46,21 +46,3 @@ func CheckPrecreatedCVICleanupOption() error {
 func IsPrecreatedCVICleanupNeeded() bool {
 	return os.Getenv(PrecreatedCVICleanupEnv) == "yes"
 }
-
-func CheckWithPostCleanUpOption() error {
-	env := os.Getenv(PostCleanUpEnv)
-	switch env {
-	case "yes", "no", "":
-		return nil
-	default:
-		log.Printf(
-			"Usual behaviour for tests is to make post cleanup (when %[1]s is not set or equal to 'yes'). Use %[1]s=no to skip post cleanup after tests.\n",
-			PostCleanUpEnv,
-		)
-		return fmt.Errorf("invalid value for the %s env: %q", PostCleanUpEnv, env)
-	}
-}
-
-func IsCleanUpNeeded() bool {
-	return os.Getenv(PostCleanUpEnv) != "no"
-}

test/e2e/internal/config/config.go

@@ -132,7 +132,7 @@ type HelperImages struct {
 
 func (c *Config) setEnvs() error {
 	// isCleanupNeeded: env var has priority over yaml config
-	if e, ok := os.LookupEnv("POST_CLEANUP"); ok {
+	if e, ok := os.LookupEnv(PostCleanupEnv); ok {
 		c.IsCleanupNeeded = e != "no"
 	}
 	// ClusterTransport

test/e2e/internal/precheck/postcleanup.go

@@ -23,11 +23,15 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 
+	"github.com/deckhouse/virtualization/test/e2e/internal/config"
 	"github.com/deckhouse/virtualization/test/e2e/internal/framework"
 )
 
 const (
-	postCleanupPrecheckEnvName = "POST_CLEANUP"
+	// POST_CLEANUP_PRECHECK controls whether the precheck runs.
+	// Precheck validates that POST_CLEANUP has a valid value.
+	// Set to "no" to disable precheck execution.
+	postCleanupPrecheckEnvName = "POST_CLEANUP_PRECHECK"
 )
 
 // postcleanupPrecheck implements Precheck interface for postcleanup option.
@@ -44,13 +48,13 @@ func (c *postcleanupPrecheck) Run(ctx context.Context, f *framework.Framework) e
 		return nil
 	}
 
-	// Validate POST_CLEANUP env var
-	env := os.Getenv(postCleanupPrecheckEnvName)
+	// Validate POST_CLEANUP env var (controls cleanup behavior)
+	env := os.Getenv(config.PostCleanupEnv)
 	switch env {
 	case "yes", "no", "":
 		// valid values
 	default:
-		return fmt.Errorf("invalid value for the %s env: %q (allowed: \"\", \"yes\", \"no\")", postCleanupPrecheckEnvName, env)
+		return fmt.Errorf("invalid value for the %s env: %q (allowed: \"\", \"yes\", \"no\")", config.PostCleanupEnv, env)
 	}
 
 	return nil

test/e2e/legacy/legacy.go

@@ -66,9 +66,6 @@ func Init() error {
 }
 
 func configure() (err error) {
-	if err = config.CheckWithPostCleanUpOption(); err != nil {
-		return err
-	}
 	if err = config.CheckPrecreatedCVICleanupOption(); err != nil {
 		return err
 	}