From 45a418e29e72ede4a37dba886a5ca7bd71f96b0f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 16 Jun 2021 09:48:21 -0400 Subject: [PATCH] builds: comment out multi-namespace template test This test relies on pulling yaml from github rather than from bindata, which makes it difficult to pre-commit testing of changes which affect it. @akram and @gabemontero will move this to the jenkins client plugin E2E, but in the meantime, we comment it out. https://github.com/openshift/origin/pull/26072#issuecomment-862307401 --- test/extended/builds/pipeline_origin_bld.go | 42 +++++++++++---------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/test/extended/builds/pipeline_origin_bld.go b/test/extended/builds/pipeline_origin_bld.go index 0b0a01079847..5039158ebacd 100644 --- a/test/extended/builds/pipeline_origin_bld.go +++ b/test/extended/builds/pipeline_origin_bld.go @@ -42,26 +42,26 @@ var _ = g.Describe("[sig-builds][Feature:Builds][sig-devex][Feature:Jenkins][Slo defer g.GinkgoRecover() var ( - jenkinsEphemeralTemplatePath = exutil.FixturePath("..", "..", "examples", "jenkins", "jenkins-ephemeral-template.json") - jenkinsPersistentTemplatePath = exutil.FixturePath("..", "..", "examples", "jenkins", "jenkins-persistent-template.json") - envVarsPipelinePath = exutil.FixturePath("testdata", "samplepipeline-withenvs.yaml") - origPipelinePath = exutil.FixturePath("..", "..", "examples", "jenkins", "pipeline", "samplepipeline.yaml") - configMapPodTemplatePath = exutil.FixturePath("testdata", "config-map-jenkins-slave-pods.yaml") - imagestreamPodTemplatePath = exutil.FixturePath("testdata", "imagestream-jenkins-slave-pods.yaml") - imagestreamtagPodTemplatePath = exutil.FixturePath("testdata", "imagestreamtag-jenkins-slave-pods.yaml") - podTemplateSlavePipelinePath = exutil.FixturePath("testdata", "jenkins-slave-template.yaml") - secretPath = exutil.FixturePath("testdata", "openshift-secret-to-jenkins-credential.yaml") - successfulPipeline = exutil.FixturePath("testdata", "builds", "build-pruning", "successful-pipeline.yaml") - failedPipeline = exutil.FixturePath("testdata", "builds", "build-pruning", "failed-pipeline.yaml") - multiNamespaceClientPluginPipelinePath = exutil.FixturePath("testdata", "multi-namespace-pipeline.yaml") - verifyServiceClientPluginPipelinePath = exutil.FixturePath("testdata", "verifyservice-pipeline-template.yaml") - pollingInterval = time.Second - timeout = time.Minute - oc = exutil.NewCLI("jenkins-pipeline") - ticker *time.Ticker - j *jenkins.JenkinsRef - pvs = []*corev1.PersistentVolume{} - nfspod = &corev1.Pod{} + //multiNamespaceClientPluginPipelinePath = exutil.FixturePath("testdata", "multi-namespace-pipeline.yaml") + jenkinsEphemeralTemplatePath = exutil.FixturePath("..", "..", "examples", "jenkins", "jenkins-ephemeral-template.json") + jenkinsPersistentTemplatePath = exutil.FixturePath("..", "..", "examples", "jenkins", "jenkins-persistent-template.json") + envVarsPipelinePath = exutil.FixturePath("testdata", "samplepipeline-withenvs.yaml") + origPipelinePath = exutil.FixturePath("..", "..", "examples", "jenkins", "pipeline", "samplepipeline.yaml") + configMapPodTemplatePath = exutil.FixturePath("testdata", "config-map-jenkins-slave-pods.yaml") + imagestreamPodTemplatePath = exutil.FixturePath("testdata", "imagestream-jenkins-slave-pods.yaml") + imagestreamtagPodTemplatePath = exutil.FixturePath("testdata", "imagestreamtag-jenkins-slave-pods.yaml") + podTemplateSlavePipelinePath = exutil.FixturePath("testdata", "jenkins-slave-template.yaml") + secretPath = exutil.FixturePath("testdata", "openshift-secret-to-jenkins-credential.yaml") + successfulPipeline = exutil.FixturePath("testdata", "builds", "build-pruning", "successful-pipeline.yaml") + failedPipeline = exutil.FixturePath("testdata", "builds", "build-pruning", "failed-pipeline.yaml") + verifyServiceClientPluginPipelinePath = exutil.FixturePath("testdata", "verifyservice-pipeline-template.yaml") + pollingInterval = time.Second + timeout = time.Minute + oc = exutil.NewCLI("jenkins-pipeline") + ticker *time.Ticker + j *jenkins.JenkinsRef + pvs = []*corev1.PersistentVolume{} + nfspod = &corev1.Pod{} cleanup = func(jenkinsTemplatePath string) { if g.CurrentGinkgoTestDescription().Failed { @@ -265,6 +265,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][sig-devex][Feature:Jenkins][Slo }) + /* to be moved to jenkins client plugin e2e g.By("should handle multi-namespace templates", func() { g.By("create additional projects") namespace := oc.Namespace() @@ -323,6 +324,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][sig-devex][Feature:Jenkins][Slo err = oc.Run("delete").Args("template", "mongodb-ephemeral").Execute() o.Expect(err).NotTo(o.HaveOccurred()) }) + */ }) })