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

* 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 <[email protected]> * Update conformance/README.md Signed-off-by: Josh Dolitsky <[email protected]> --------- Signed-off-by: Ramkumar Chinchani <[email protected]> Signed-off-by: Josh Dolitsky <[email protected]> Co-authored-by: Josh Dolitsky <[email protected]>
opencontainers · Jun 21, 2023 · aef0f61 · aef0f61
1 parent adeb3ac
commit aef0f61
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
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)