unused aws instace and vpcs cleanup

Signed-off-by: shiva kumar <[email protected]>

tests/aws_test.go

@@ -29,7 +29,6 @@ import (
 	"github.com/NVIDIA/holodeck/pkg/jyaml"
 	"github.com/NVIDIA/holodeck/pkg/provider"
 	"github.com/NVIDIA/holodeck/pkg/provisioner"
-	"github.com/NVIDIA/holodeck/tests/common"
 )
 
 // Actual test suite
@@ -58,7 +57,6 @@ var _ = Describe("AWS", func() {
 			// Set unique name for the environment
 			// Set env name
 			setCfgName(&opts.cfg)
-			opts.cfg.Name = opts.cfg.Name + "-" + common.GenerateUID()
 			// set cache path
 			opts.cachePath = LogArtifactDir
 			// set cache file

tests/common/common.go

@@ -28,3 +28,16 @@ func GenerateUID() string {
 
 	return string(b)
 }
+
+func setCfgName(cfg *v1alpha1.Environment) {
+	sha := os.Getenv("GITHUB_SHA")
+	attempt := os.Getenv("GITHUB_RUN_ATTEMPT")
+	// short sha
+	if len(sha) > 8 {
+		sha = sha[:8]
+	}
+	// uid is unique for each run
+	uid := GenerateUID()
+
+	cfg.Name = fmt.Sprintf("ci%s-%s-%s", attempt, sha, uid)
+}