replace registry.redhat.io refs with internal image registry refs in image-eco e2e
@@ -14,9 +14,8 @@ type tc struct {
// Expected output from the command
Expected string
- // Repository is either openshift/ or rhcsl/
- // The default is 'openshift'
- Repository string
+ // Tag is the image tag to correlates to the Version string
+ Tag string
// Internal: We resolve this in JustBeforeEach
DockerImageReference string
@@ -32,14 +31,14 @@ var s2iImages = map[string][]tc{
Version: "27",
Cmd: "ruby --version",
Expected: "ruby 2.7",
- Repository: "rhscl",
+ Tag: "2.7",
NonAMD: true,
},
{
Version: "26",
Cmd: "ruby --version",
Expected: "ruby 2.6",
- Repository: "rhscl",
+ Tag: "2.6",
NonAMD: true,
},
},
@@ -48,14 +47,14 @@ var s2iImages = map[string][]tc{
Version: "27",
Cmd: "python --version",
Expected: "Python 2.7",
- Repository: "rhscl",
+ Tag: "2.7",
NonAMD: true,
},
{
Version: "36",
Cmd: "python --version",
Expected: "Python 3.6",
- Repository: "rhscl",
+ Tag: "3.6-ubi8",
NonAMD: true,
},
},
@@ -64,14 +63,14 @@ var s2iImages = map[string][]tc{
Version: "10",
Cmd: "node --version",
Expected: "v10",
- Repository: "rhscl",
+ Tag: "10",
NonAMD: true,
},
{
Version: "12",
Cmd: "node --version",
Expected: "v12",
- Repository: "rhscl",
+ Tag: "12",
NonAMD: true,
},
},
@@ -80,7 +79,7 @@ var s2iImages = map[string][]tc{
Version: "526",
Cmd: "perl --version",
Expected: "v5.26",
- Repository: "rhscl",
+ Tag: "5.26",
NonAMD: true,
},
},
@@ -89,14 +88,14 @@ var s2iImages = map[string][]tc{
Version: "72",
Cmd: "php --version",
Expected: "7.2",
- Repository: "rhscl",
+ Tag: "7.2-ubi8",
NonAMD: true,
},
{
Version: "73",
Cmd: "php --version",
Expected: "7.3",
- Repository: "rhscl",
+ Tag: "7.3",
NonAMD: true,
},
},
@@ -115,8 +114,5 @@ func GetTestCaseForImages() map[string][]tc {
// resolveDockerImageReferences resolves the pull specs for all images
func resolveDockerImageReference(name string, t *tc) {
- if len(t.Repository) == 0 {
- t.Repository = "openshift"
- }
- t.DockerImageReference = fmt.Sprintf("registry.redhat.io/%s/%s-%s-rhel7", t.Repository, name, t.Version)
+ t.DockerImageReference = fmt.Sprintf("image-registry.openshift-image-registry.svc:5000/openshift/%s:%s", name, t.Tag)
}
