Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-4.12] OCPBUGS-14236: Remove closed centos7 registry from newapp unit tests #1434

Merged
merged 1 commit into from May 30, 2023
Merged

[release-4.12] OCPBUGS-14236: Remove closed centos7 registry from newapp unit tests #1434

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions pkg/helpers/newapp/newapptest/newapp_test.go
View file
Open in desktop
Expand Up @@ -1262,13 +1262,13 @@ func TestNewAppRunBuilds(t *testing.T) {
},
},
GenerationInputs: cmd.GenerationInputs{
SourceImage: "registry.centos.org/centos/mongodb-34-centos7",
SourceImage: "quay.io/centos7/httpd-24-centos7",
SourceImagePath: "/src:dst",
},
},
expected: map[string][]string{
"buildConfig": {"ruby-hello-world"},
"imageStream": {"mongodb-34-centos7", "ruby-27", "ruby-hello-world"},
"imageStream": {"httpd-24-centos7", "ruby-27", "ruby-hello-world"},
},
checkResult: func(res *cmd.AppResult) error {
var bc *buildv1.BuildConfig
Expand All @@ -1286,7 +1286,7 @@ func TestNewAppRunBuilds(t *testing.T) {
}
var got string

want := "mongodb-34-centos7:latest"
want := "httpd-24-centos7:latest"
got = bc.Spec.Source.Images[0].From.Name
if got != want {
return fmt.Errorf("bc.Spec.Source.Image.From.Name = %q; want %q", got, want)
Expand Down Expand Up @@ -1320,13 +1320,13 @@ func TestNewAppRunBuilds(t *testing.T) {
},
GenerationInputs: cmd.GenerationInputs{
To: "outputimage",
SourceImage: "registry.centos.org/centos/mongodb-34-centos7",
SourceImage: "quay.io/centos7/httpd-24-centos7",
SourceImagePath: "/src:dst",
},
},
expected: map[string][]string{
"buildConfig": {"outputimage"},
"imageStream": {"mongodb-34-centos7", "nodejs-010-centos7", "outputimage"},
"imageStream": {"httpd-24-centos7", "nodejs-010-centos7", "outputimage"},
},
checkResult: func(res *cmd.AppResult) error {
var bc *buildv1.BuildConfig
Expand All @@ -1344,7 +1344,7 @@ func TestNewAppRunBuilds(t *testing.T) {
}
var got string

want := "mongodb-34-centos7:latest"
want := "httpd-24-centos7:latest"
got = bc.Spec.Source.Images[0].From.Name
if got != want {
return fmt.Errorf("bc.Spec.Source.Image.From.Name = %q; want %q", got, want)
Expand Down Expand Up @@ -1419,7 +1419,7 @@ func TestNewAppRunBuilds(t *testing.T) {
config: &cmd.AppConfig{
ComponentInputs: cmd.ComponentInputs{
Components: []string{
"registry.centos.org/centos/nodejs-12-centos7~https://github.com/sclorg/nodejs-ex",
"quay.io/centos7/nodejs-12-centos7~https://github.com/sclorg/nodejs-ex",
},
},
GenerationInputs: cmd.GenerationInputs{
Expand Down Expand Up @@ -1815,7 +1815,7 @@ func TestNewAppNewBuildEnvVars(t *testing.T) {
config: &cmd.AppConfig{
ComponentInputs: cmd.ComponentInputs{
SourceRepositories: []string{"https://github.com/openshift/ruby-hello-world"},
DockerImages: []string{"quay.io/centos7/ruby-27-centos7", "registry.centos.org/centos/nodejs-12-centos7"},
DockerImages: []string{"quay.io/centos7/ruby-27-centos7", "quay.io/centos7/nodejs-12-centos7"},
},
GenerationInputs: cmd.GenerationInputs{
OutputDocker: true,
Expand Down Expand Up @@ -1891,7 +1891,7 @@ func TestNewAppBuildConfigEnvVarsAndSecrets(t *testing.T) {
config: &cmd.AppConfig{
ComponentInputs: cmd.ComponentInputs{
SourceRepositories: []string{"https://github.com/openshift/ruby-hello-world"},
DockerImages: []string{"quay.io/centos7/ruby-27-centos7", "registry.centos.org/centos/mongodb-34-centos7"},
DockerImages: []string{"quay.io/centos7/ruby-27-centos7", "quay.io/centos7/httpd-24-centos7"},
},
GenerationInputs: cmd.GenerationInputs{
OutputDocker: true,
Expand Down