read env var only once

Signed-off-by: Stefan Majewsky <[email protected]>
Signed-off-by: Vincent Batts <[email protected]>

Author: majewsky

conformance/01_pull_test.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"net/http"
 	"os"
-	"strconv"
 
 	"github.com/bloodorangeio/reggie"
 	g "github.com/onsi/ginkgo"
@@ -153,9 +152,7 @@ var test01Pull = func() {
 		})
 
 		g.Context("Teardown", func() {
-			deleteManifestFirst, _ := strconv.ParseBool(os.Getenv(envVarDeleteManifestBeforeBlobs))
-
-			if deleteManifestFirst {
+			if deleteManifestBeforeBlobs {
 				g.Specify("Delete manifest created in setup", func() {
 					SkipIfDisabled(pull)
 					RunOnlyIf(runPullSetup)
@@ -190,7 +187,7 @@ var test01Pull = func() {
 					BeNumerically("<", 300)))
 			})
 
-			if !deleteManifestFirst {
+			if !deleteManifestBeforeBlobs {
 				g.Specify("Delete manifest created in setup", func() {
 					SkipIfDisabled(pull)
 					RunOnlyIf(runPullSetup)

conformance/02_push_test.go

@@ -3,8 +3,6 @@ package conformance
 import (
 	"fmt"
 	"net/http"
-	"os"
-	"strconv"
 
 	"github.com/bloodorangeio/reggie"
 	g "github.com/onsi/ginkgo"
@@ -248,9 +246,7 @@ var test02Push = func() {
 		})
 
 		g.Context("Teardown", func() {
-			deleteManifestFirst, _ := strconv.ParseBool(os.Getenv(envVarDeleteManifestBeforeBlobs))
-
-			if deleteManifestFirst {
+			if deleteManifestBeforeBlobs {
 				g.Specify("Delete manifest created in tests", func() {
 					SkipIfDisabled(push)
 					RunOnlyIf(runPushSetup)
@@ -297,7 +293,7 @@ var test02Push = func() {
 				))
 			})
 
-			if !deleteManifestFirst {
+			if !deleteManifestBeforeBlobs {
 				g.Specify("Delete manifest created in tests", func() {
 					SkipIfDisabled(push)
 					RunOnlyIf(runPushSetup)

conformance/03_discovery_test.go

@@ -128,9 +128,7 @@ var test03ContentDiscovery = func() {
 		})
 
 		g.Context("Teardown", func() {
-			deleteManifestFirst, _ := strconv.ParseBool(os.Getenv(envVarDeleteManifestBeforeBlobs))
-
-			if deleteManifestFirst {
+			if deleteManifestBeforeBlobs {
 				g.Specify("Delete created manifest & associated tags", func() {
 					SkipIfDisabled(contentDiscovery)
 					RunOnlyIf(runContentDiscoverySetup)
@@ -165,7 +163,7 @@ var test03ContentDiscovery = func() {
 					BeNumerically("<", 300)))
 			})
 
-			if !deleteManifestFirst {
+			if !deleteManifestBeforeBlobs {
 				g.Specify("Delete created manifest & associated tags", func() {
 					SkipIfDisabled(contentDiscovery)
 					RunOnlyIf(runContentDiscoverySetup)

conformance/setup.go

@@ -124,6 +124,7 @@ var (
 	runContentDiscoverySetup  bool
 	runContentManagementSetup bool
 	skipEmptyLayerTest        bool
+	deleteManifestBeforeBlobs bool
 	Version                   = "unknown"
 )
 
@@ -275,6 +276,7 @@ func init() {
 	runContentDiscoverySetup = true
 	runContentManagementSetup = true
 	skipEmptyLayerTest = false
+	deleteManifestBeforeBlobs = false
 
 	if os.Getenv(envVarTagName) != "" &&
 		os.Getenv(envVarManifestDigest) != "" &&
@@ -287,6 +289,7 @@ func init() {
 	}
 
 	skipEmptyLayerTest, _ = strconv.ParseBool(os.Getenv(envVarPushEmptyLayer))
+	deleteManifestBeforeBlobs, _ = strconv.ParseBool(os.Getenv(envVarDeleteManifestBeforeBlobs))
 
 	reportJUnitFilename = "junit.xml"
 	reportHTMLFilename = "report.html"