allow ability to skip single-shot upload test

Signed-off-by: Josh Dolitsky <[email protected]>

Author: jdolitsky

conformance/02_push_test.go

@@ -62,6 +62,7 @@ var test02Push = func() {
 
 			g.Specify("POST request with digest and blob should yield a 201 or 202", func() {
 				SkipIfDisabled(push)
+				RunOnlyIfNot(skipSingleShotUploadTest)
 				req := client.NewRequest(reggie.POST, "/v2/<name>/blobs/uploads/").
 					SetHeader("Content-Length", configBlobContentLength).
 					SetHeader("Content-Type", "application/octet-stream").
@@ -80,6 +81,7 @@ var test02Push = func() {
 
 			g.Specify("GET request to blob URL from prior request should yield 200 or 404 based on response code", func() {
 				SkipIfDisabled(push)
+				RunOnlyIfNot(skipSingleShotUploadTest)
 				req := client.NewRequest(reggie.GET, "/v2/<name>/blobs/<digest>", reggie.WithDigest(configBlobDigest))
 				resp, err := client.Do(req)
 				Expect(err).To(BeNil())

conformance/README.md

@@ -102,10 +102,17 @@ and another with no layers. If the empty-layer test is causing a failure, it can
 environment:
 
 ```
-# Enable layer upload
 OCI_SKIP_EMPTY_LAYER_PUSH_TEST=1
 ```
 
+Some registries support pushing blobs with a single POST request; however, this behaviour is not strictly required.
+If you wish to disable the single POST test (a.k.a. the "single shot upload"), it can be skipped by setting the
+following in the environment:
+
+```
+OCI_SKIP_SINGLE_SHOT_UPLOAD_TEST=1
+```
+
 The test suite will need access to a second namespace. This namespace is used to check support for cross-repository mounting
 of blobs, and may need to be configured on the server-side in advance. It is specified by setting the following in
 the environment:

conformance/setup.go

@@ -57,6 +57,7 @@ const (
 	envVarContentDiscovery          = "OCI_TEST_CONTENT_DISCOVERY"
 	envVarContentManagement         = "OCI_TEST_CONTENT_MANAGEMENT"
 	envVarPushEmptyLayer            = "OCI_SKIP_EMPTY_LAYER_PUSH_TEST"
+	envVarSingleShotUpload          = "OCI_SKIP_SINGLE_SHOT_UPLOAD_TEST"
 	envVarBlobDigest                = "OCI_BLOB_DIGEST"
 	envVarManifestDigest            = "OCI_MANIFEST_DIGEST"
 	envVarEmptyLayerManifestDigest  = "OCI_EMPTY_LAYER_MANIFEST_DIGEST"
@@ -129,6 +130,7 @@ var (
 	runContentDiscoverySetup  bool
 	runContentManagementSetup bool
 	skipEmptyLayerTest        bool
+	skipSingleShotUploadTest  bool
 	deleteManifestBeforeBlobs bool
 	Version                   = "unknown"
 )
@@ -289,6 +291,7 @@ func init() {
 	runContentDiscoverySetup = true
 	runContentManagementSetup = true
 	skipEmptyLayerTest = false
+	skipSingleShotUploadTest = false
 	deleteManifestBeforeBlobs = false
 
 	if os.Getenv(envVarTagName) != "" &&
@@ -302,6 +305,7 @@ func init() {
 	}
 
 	skipEmptyLayerTest, _ = strconv.ParseBool(os.Getenv(envVarPushEmptyLayer))
+	skipSingleShotUploadTest, _ = strconv.ParseBool(os.Getenv(envVarSingleShotUpload))
 	deleteManifestBeforeBlobs, _ = strconv.ParseBool(os.Getenv(envVarDeleteManifestBeforeBlobs))
 
 	reportJUnitFilename = "junit.xml"