From 77539a8593409fd6450acf60e66ea773837c1469 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Mon, 13 Oct 2025 16:30:05 -0400 Subject: [PATCH] test/extended/image_ecosystem.NewSampleRepoTest(): fix django-psql The template for django-psql-example apps doesn't specify a branch, but the default branch no longer contains anything. Update the test to supply "2.2.x" as the branch name to use in the https://github.com/sclorg/django-ex.git repository. Signed-off-by: Nalin Dahyabhai --- test/extended/image_ecosystem/sample_repos.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/test/extended/image_ecosystem/sample_repos.go b/test/extended/image_ecosystem/sample_repos.go index f72407f17a16..8d797416fc45 100644 --- a/test/extended/image_ecosystem/sample_repos.go +++ b/test/extended/image_ecosystem/sample_repos.go @@ -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 @@ -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()) @@ -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"}, }, ))