Skip to content

Commit c965c26

Browse files
Merge pull request #19465 from gabemontero/reenable-client-plugin-exttest
re-enable jenkins client plugin ext tests
2 parents 22b3508 + bc2d851 commit c965c26

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

test/extended/builds/pipeline.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,16 @@ var _ = g.Describe("[Feature:Builds][Slow] openshift pipeline build", func() {
6565
mavenSlavePipelinePath = exutil.FixturePath("..", "..", "examples", "jenkins", "pipeline", "maven-pipeline.yaml")
6666
mavenSlaveGradlePipelinePath = exutil.FixturePath("testdata", "builds", "gradle-pipeline.yaml")
6767
//orchestrationPipelinePath = exutil.FixturePath("..", "..", "examples", "jenkins", "pipeline", "mapsapp-pipeline.yaml")
68-
blueGreenPipelinePath = exutil.FixturePath("..", "..", "examples", "jenkins", "pipeline", "bluegreen-pipeline.yaml")
69-
//clientPluginPipelinePath = exutil.FixturePath("..", "..", "examples", "jenkins", "pipeline", "openshift-client-plugin-pipeline.yaml")
70-
envVarsPipelinePath = exutil.FixturePath("testdata", "samplepipeline-withenvs.yaml")
71-
origPipelinePath = exutil.FixturePath("..", "..", "examples", "jenkins", "pipeline", "samplepipeline.yaml")
72-
configMapPodTemplatePath = exutil.FixturePath("testdata", "config-map-jenkins-slave-pods.yaml")
73-
imagestreamPodTemplatePath = exutil.FixturePath("testdata", "imagestream-jenkins-slave-pods.yaml")
74-
imagestreamtagPodTemplatePath = exutil.FixturePath("testdata", "imagestreamtag-jenkins-slave-pods.yaml")
75-
podTemplateSlavePipelinePath = exutil.FixturePath("testdata", "jenkins-slave-template.yaml")
76-
//multiNamespaceClientPluginPipelinePath = exutil.FixturePath("testdata", "multi-namespace-pipeline.yaml")
77-
secretPath = exutil.FixturePath("testdata", "openshift-secret-to-jenkins-credential.yaml")
68+
blueGreenPipelinePath = exutil.FixturePath("..", "..", "examples", "jenkins", "pipeline", "bluegreen-pipeline.yaml")
69+
clientPluginPipelinePath = exutil.FixturePath("..", "..", "examples", "jenkins", "pipeline", "openshift-client-plugin-pipeline.yaml")
70+
envVarsPipelinePath = exutil.FixturePath("testdata", "samplepipeline-withenvs.yaml")
71+
origPipelinePath = exutil.FixturePath("..", "..", "examples", "jenkins", "pipeline", "samplepipeline.yaml")
72+
configMapPodTemplatePath = exutil.FixturePath("testdata", "config-map-jenkins-slave-pods.yaml")
73+
imagestreamPodTemplatePath = exutil.FixturePath("testdata", "imagestream-jenkins-slave-pods.yaml")
74+
imagestreamtagPodTemplatePath = exutil.FixturePath("testdata", "imagestreamtag-jenkins-slave-pods.yaml")
75+
podTemplateSlavePipelinePath = exutil.FixturePath("testdata", "jenkins-slave-template.yaml")
76+
multiNamespaceClientPluginPipelinePath = exutil.FixturePath("testdata", "multi-namespace-pipeline.yaml")
77+
secretPath = exutil.FixturePath("testdata", "openshift-secret-to-jenkins-credential.yaml")
7878

7979
oc = exutil.NewCLI("jenkins-pipeline", exutil.KubeConfigPath())
8080
ticker *time.Ticker
@@ -197,7 +197,7 @@ var _ = g.Describe("[Feature:Builds][Slow] openshift pipeline build", func() {
197197

198198
// these tests are isolated so that PR testing the the jenkins-client-plugin can execute the extended
199199
// tests with a ginkgo focus that runs only the tests within this ginkgo context
200-
/*g.Context("jenkins-client-plugin tests", func() {
200+
g.Context("jenkins-client-plugin tests", func() {
201201

202202
g.It("using the ephemeral template", func() {
203203
defer cleanup()
@@ -309,7 +309,7 @@ var _ = g.Describe("[Feature:Builds][Slow] openshift pipeline build", func() {
309309
o.Expect(err).NotTo(o.HaveOccurred())
310310
})
311311
})
312-
})*/
312+
})
313313

314314
g.Context("Sync plugin tests", func() {
315315

0 commit comments

Comments
 (0)