Skip to content

Bug 1978442: comment out multi-namespace jenkins pipeline templates test; moving it to jenkins client plugin in-repo e2e's #26301

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

Merged
openshift-merge-robot merged 1 commit into from
Jul 8, 2021
Merged

Bug 1978442: comment out multi-namespace jenkins pipeline templates test; moving it to jenkins client plugin in-repo e2e's #26301

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
43 changes: 22 additions & 21 deletions test/extended/builds/pipeline_origin_bld.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
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{}

cleanup = func(jenkinsTemplatePath string) {
if g.CurrentGinkgoTestDescription().Failed {
Expand Down Expand Up @@ -264,6 +264,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()
Expand Down Expand Up @@ -321,7 +322,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][sig-devex][Feature:Jenkins][Slo
o.Expect(err).NotTo(o.HaveOccurred())
err = oc.Run("delete").Args("template", "mongodb-ephemeral").Execute()
o.Expect(err).NotTo(o.HaveOccurred())
})
})*/
})
})

Expand Down