Merge pull request #11245 from legionus/refactor-parse-dockerimagereference

Merged by openshift-bot

Author: OpenShift Bot

pkg/api/graph/test/prereq-image-not-present.yaml

@@ -90,7 +90,7 @@ items:
       sourceStrategy:
         from:
           kind: ImageStreamImage
-          name: ruby-20-centos7@603bfa418
+          name: ruby-20-centos7@sha256:603bfa418e1ff0a486f3d795a8b69a2f8f5eed488fbf5c286bffd8ab77b8e7a5
           namespace: openshift
       type: Docker
     triggers:

pkg/api/graph/test/prereq-image-present-notag.yaml

@@ -160,7 +160,7 @@ items:
       sourceStrategy:
         from:
           kind: ImageStreamImage
-          name: ruby-20-centos7@603bfa418
+          name: ruby-20-centos7@sha256:603bfa418e1ff0a486f3d795a8b69a2f8f5eed488fbf5c286bffd8ab77b8e7a5
           namespace: openshift
       type: Docker
     triggers:

pkg/api/graph/test/prereq-image-present-with-sched.yaml

@@ -90,7 +90,7 @@ items:
       sourceStrategy:
         from:
           kind: ImageStreamImage
-          name: ruby-20-centos7@603bfa418
+          name: ruby-20-centos7@sha256:603bfa418e1ff0a486f3d795a8b69a2f8f5eed488fbf5c286bffd8ab77b8e7a5
           namespace: example
       type: Docker
     triggers:

pkg/api/graph/test/prereq-image-present.yaml

@@ -90,7 +90,7 @@ items:
       sourceStrategy:
         from:
           kind: ImageStreamImage
-          name: ruby-20-centos7@603bfa418
+          name: ruby-20-centos7@sha256:603bfa418e1ff0a486f3d795a8b69a2f8f5eed488fbf5c286bffd8ab77b8e7a5
           namespace: openshift
       type: Docker
     triggers:

pkg/build/controller/strategy/custom_test.go

@@ -207,7 +207,7 @@ func mockCustomBuild(forcePull, emptySource bool) *buildapi.Build {
 				Output: buildapi.BuildOutput{
 					To: &kapi.ObjectReference{
 						Kind: "DockerImage",
-						Name: "docker-registry/repository/customBuild",
+						Name: "docker-registry.io/repository/custombuild",
 					},
 					PushSecret: &kapi.LocalObjectReference{Name: "foo"},
 				},

pkg/build/generator/generator_test.go

@@ -24,7 +24,7 @@ import (
 type FakeDockerCfg map[string]map[string]string
 
 const (
-	originalImage = "originalImage"
+	originalImage = "originalimage"
 	newImage      = originalImage + ":" + newTag
 
 	tagName          = "test"

pkg/cmd/admin/migrate/images/imagerefs_test.go

@@ -29,11 +29,11 @@ func TestImageReferenceMappingsMapReference(t *testing.T) {
 
 				"mysql@sha256:b2f400f4a5e003b0543decf61a0a010939f3fba07bafa226f11ed7b5f1e81237": "index.docker.io/mysql@sha256:b2f400f4a5e003b0543decf61a0a010939f3fba07bafa226f11ed7b5f1e81237",
 
-				"docker.io/mysql":                "index.docker.io/library/mysql",
-				"docker.io/mysql:latest":         "index.docker.io/library/mysql:latest",
+				"docker.io/mysql":                "index.docker.io/mysql",
+				"docker.io/mysql:latest":         "index.docker.io/mysql:latest",
 				"docker.io/default/mysql:latest": "index.docker.io/default/mysql:latest",
 
-				"docker.io/mysql@sha256:b2f400f4a5e003b0543decf61a0a010939f3fba07bafa226f11ed7b5f1e81237": "index.docker.io/library/mysql@sha256:b2f400f4a5e003b0543decf61a0a010939f3fba07bafa226f11ed7b5f1e81237",
+				"docker.io/mysql@sha256:b2f400f4a5e003b0543decf61a0a010939f3fba07bafa226f11ed7b5f1e81237": "index.docker.io/mysql@sha256:b2f400f4a5e003b0543decf61a0a010939f3fba07bafa226f11ed7b5f1e81237",
 			},
 		},
 		{
@@ -54,9 +54,6 @@ func TestImageReferenceMappingsMapReference(t *testing.T) {
 				"myregistry.com/test/other:latest": "myregistry.com/other/test:latest",
 
 				"test/other/b:latest": "test/other/b:latest",
-
-				// TODO: this is possibly wrong with V2 and latest daemon
-				"b/test/other:latest": "b/other/test:latest",
 			},
 		},
 	}