fix: delete manifest before blobs by default (#423)

rchincha · jdolitsky · web-flow · commit aef0f618f800 · 2023-06-21T12:28:43.000-05:00
* fix: delete manifest before blobs by default

Currently the conformance tests default to deleting manifests after
blobs, which leaves the manifest dangling. Furthermore, the same blob may be
referenced in many manifests.

AFAIK, no client does this.

So changing default behavior.

Signed-off-by: Ramkumar Chinchani &lt;rchincha@cisco.com&gt;

* Update conformance/README.md

Signed-off-by: Josh Dolitsky &lt;393494+jdolitsky@users.noreply.github.com&gt;

---------

Signed-off-by: Ramkumar Chinchani &lt;rchincha@cisco.com&gt;
Signed-off-by: Josh Dolitsky &lt;393494+jdolitsky@users.noreply.github.com&gt;
Co-authored-by: Josh Dolitsky &lt;393494+jdolitsky@users.noreply.github.com&gt;
diff --git a/conformance/README.md b/conformance/README.md
@@ -31,7 +31,7 @@ export OCI_TEST_CONTENT_MANAGEMENT=1
 # Extra settings
 export OCI_HIDE_SKIPPED_WORKFLOWS=0
 export OCI_DEBUG=0
-export OCI_DELETE_MANIFEST_BEFORE_BLOBS=0
+export OCI_DELETE_MANIFEST_BEFORE_BLOBS=0 # defaults to OCI_DELETE_MANIFEST_BEFORE_BLOBS=1 if not set
 ```
 
 Lastly, run the tests:
diff --git a/conformance/setup.go b/conformance/setup.go
@@ -310,7 +310,7 @@ func init() {
 	runContentDiscoverySetup = true
 	runContentManagementSetup = true
 	skipEmptyLayerTest = false
-	deleteManifestBeforeBlobs = false
+	deleteManifestBeforeBlobs = true
 
 	if os.Getenv(envVarTagName) != "" &&
 		os.Getenv(envVarManifestDigest) != "" &&
@@ -323,7 +323,9 @@ func init() {
 	}
 
 	skipEmptyLayerTest, _ = strconv.ParseBool(os.Getenv(envVarPushEmptyLayer))
-	deleteManifestBeforeBlobs, _ = strconv.ParseBool(os.Getenv(envVarDeleteManifestBeforeBlobs))
+	if v, ok := os.LookupEnv(envVarDeleteManifestBeforeBlobs); ok {
+		deleteManifestBeforeBlobs, _ = strconv.ParseBool(v)
+	}
 	automaticCrossmountVal := ""
 	automaticCrossmountVal, runAutomaticCrossmountTest = os.LookupEnv(envVarAutomaticCrossmount)
 	automaticCrossmountEnabled, _ = strconv.ParseBool(automaticCrossmountVal)
