Skip to content

test/extended/image_ecosystem.NewSampleRepoTest(): fix django-psql #30376

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

test/extended/image_ecosystem.NewSampleRepoTest(): fix django-psql #30376

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion test/extended/image_ecosystem/sample_repos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ type sampleRepoConfig struct {
dbDeploymentConfigName string
dbDeploymentName string
dbServiceName string
newAppParams string
newAppParams string // used as a format specifier with the namespace passed as the arg
namespacedNewAppParams []string // used as a format specifier with the namespace passed as the arg
clusterNewAppParams []string // used verbatim
}

// NewSampleRepoTest creates a function for a new ginkgo test case that will instantiate a template
Expand Down Expand Up @@ -63,6 +65,15 @@ func NewSampleRepoTest(c sampleRepoConfig) func() {
c.newAppParams = fmt.Sprintf(c.newAppParams, oc.Namespace())
newAppArgs = append(newAppArgs, c.newAppParams)
}
for _, param := range c.namespacedNewAppParams {
newAppArgs = append(newAppArgs, "-p")
namespacedParam := fmt.Sprintf(param, oc.Namespace())
newAppArgs = append(newAppArgs, namespacedParam)
}
for _, param := range c.clusterNewAppParams {
newAppArgs = append(newAppArgs, "-p")
newAppArgs = append(newAppArgs, param)
}
err = oc.Run("new-app").Args(newAppArgs...).Execute()
o.Expect(err).NotTo(o.HaveOccurred())

Expand Down Expand Up @@ -165,6 +176,7 @@ var _ = g.Describe("[sig-devex][Feature:ImageEcosystem][Slow] openshift sample a
dbDeploymentConfigName: "postgresql",
dbServiceName: "postgresql",
newAppParams: "APPLICATION_DOMAIN=django-%s.ocp.io",
clusterNewAppParams: []string{"SOURCE_REPOSITORY_REF=2.2.x"},
},
))

Expand Down