Skip to content

Comments

oc describe for JenkinsBuildStrategy#9446

Merged
openshift-bot merged 1 commit intoopenshift:masterfrom
gabemontero:issue9441
Jun 21, 2016
Merged

oc describe for JenkinsBuildStrategy#9446
openshift-bot merged 1 commit intoopenshift:masterfrom
gabemontero:issue9441

Conversation

@gabemontero
Copy link
Contributor

@gabemontero gabemontero commented Jun 20, 2016

Fixes #9441

@bparees PTAL

btw, my reading of the types.go is that both Jenkinsfile and JenkinsfilePath can be empty, and I don't see any validation insuring at least one of them is set. Is that intended?

@bparees
Copy link
Contributor

bparees commented Jun 20, 2016

my reading of the types.go is that both Jenkinsfile and JenkinsfilePath can be empty, and I don't see any validation insuring at least one of them is set. Is that intended?

yes that's correct because you can just supply a Jenkinsfile in the root of your git repo.

formatString(out, "Jenkinsfile path", s.JenkinsfilePath)
}
if len(s.Jenkinsfile) != 0 {
formatString(out, "Jenkinsfile contents", s.Jenkinsfile)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we may not want to print the full contents... do we print the full Dockerfile when the buildconfig has an in-line dockerfile definition?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it appears to print the full contents, though it does some newline related processing:

            fmt.Fprintf(out, "Dockerfile:\n")
            for _, s := range strings.Split(*p.Source.Dockerfile, "\n") {
                fmt.Fprintf(out, "  %s\n", s)
            }

I'll mimic this for the Jenkinsfile.

@gabemontero
Copy link
Contributor Author

comment induced updated pushed

@bparees
Copy link
Contributor

bparees commented Jun 21, 2016

lgtm, thanks @gabemontero!
[merge]

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 7a644e8

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/5143/)

@gabemontero
Copy link
Contributor Author

merge job got yum/mirror issues during conformance and integration tests

@bparees
Copy link
Contributor

bparees commented Jun 21, 2016

[merge]

2 similar comments
@bparees
Copy link
Contributor

bparees commented Jun 21, 2016

[merge]

@bparees
Copy link
Contributor

bparees commented Jun 21, 2016

[merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Jun 21, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/5143/) (Image: devenv-rhel7_4424)

@bparees
Copy link
Contributor

bparees commented Jun 21, 2016

[merge]

On Tue, Jun 21, 2016 at 5:55 PM, OpenShift Bot notifications@github.com
wrote:

continuous-integration/openshift-jenkins/merge FAILURE (
https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/5198/)


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#9446 (comment),
or mute the thread
https://github.com/notifications/unsubscribe/AEvl3mgxWUNuEIOz8qU-311FgjoU_xSsks5qOF3agaJpZM4I6Hzh
.

Ben Parees | OpenShift

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 7a644e8

@openshift-bot openshift-bot merged commit 384df87 into openshift:master Jun 21, 2016
@gabemontero gabemontero deleted the issue9441 branch June 22, 2016 01:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants