Merge pull request #12092 from legionus/registry-add-oss-storage-driver

Merged by openshift-bot

Author: OpenShift Bot

Godeps/Godeps.json

@@ -34,7 +34,7 @@ readonly OS_IMAGE_COMPILE_TARGETS=(
   cmd/gitserver
   "${OS_SDN_COMPILE_TARGETS_LINUX[@]}"
 )
-readonly OS_IMAGE_COMPILE_GOFLAGS="-tags include_gcs"
+readonly OS_IMAGE_COMPILE_GOFLAGS="-tags 'include_gcs include_oss'"
 readonly OS_SCRATCH_IMAGE_COMPILE_TARGETS=(
   examples/hello-openshift
   examples/deployment

hack/common.sh

@@ -32,6 +32,7 @@ import (
 	_ "github.com/docker/distribution/registry/storage/driver/gcs"
 	_ "github.com/docker/distribution/registry/storage/driver/inmemory"
 	_ "github.com/docker/distribution/registry/storage/driver/middleware/cloudfront"
+	_ "github.com/docker/distribution/registry/storage/driver/oss"
 	_ "github.com/docker/distribution/registry/storage/driver/s3-aws"
 	_ "github.com/docker/distribution/registry/storage/driver/swift"
 

pkg/cmd/dockerregistry/dockerregistry.go

@@ -151,6 +151,9 @@ os::cmd::expect_success "docker pull ${DOCKER_REGISTRY}/cache/mysql:pullthrough"
 os::log::info "Docker registry start with GCS"
 os::cmd::expect_failure_and_text "docker run -e REGISTRY_STORAGE=\"gcs: {}\" openshift/origin-docker-registry:${TAG}" "No bucket parameter provided"
 
+os::log::info "Docker registry start with OSS"
+os::cmd::expect_failure_and_text "docker run -e REGISTRY_STORAGE=\"oss: {}\" openshift/origin-docker-registry:${TAG}" "No accesskeyid parameter provided"
+
 os::log::info "Docker pull from istag"
 os::cmd::expect_success "oc import-image --confirm --from=hello-world:latest -n test hello-world:pullthrough"
 os::cmd::expect_success "docker pull ${DOCKER_REGISTRY}/test/hello-world:pullthrough"