Skip to content

do s2i git cloning up front, not in s2i itself #12234

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.

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
merged 1 commit into from
Dec 19, 2016

Conversation

bparees
Copy link
Contributor

@bparees bparees commented Dec 12, 2016

@bparees
Copy link
Contributor Author

bparees commented Dec 12, 2016

[test]

@bparees
Copy link
Contributor Author

bparees commented Dec 12, 2016

[testextended][extended:core(builds|image_ecosystem)]

@bparees bparees changed the title do s2i git cloning up front, not in s2i itself [WIP] do s2i git cloning up front, not in s2i itself Dec 12, 2016
@bparees bparees changed the title [WIP] do s2i git cloning up front, not in s2i itself do s2i git cloning up front, not in s2i itself Dec 12, 2016
@bparees
Copy link
Contributor Author

bparees commented Dec 12, 2016

@csrwng ptal. This doesn't totally eliminate the "downloader" override because the concept of having a "downloader" is pretty intrinsic in s2i, but at least now the downloader we pass is basically a no-op and all the actual source cloning/setup is done up front in a similar way to how its done for docker builds.

@bparees
Copy link
Contributor Author

bparees commented Dec 12, 2016

flake #12236
(but also some legit looking issues)

@bparees bparees force-pushed the gitclone branch 4 times, most recently from 36e9098 to 4c6b98c Compare December 19, 2016 04:48
@bparees
Copy link
Contributor Author

bparees commented Dec 19, 2016

@csrwng ok, now ptal

download.sourceInfo = &sourceInfo.SourceInfo
revision := updateBuildRevision(s.build, sourceInfo)
if updateErr := retryBuildStatusUpdate(s.build, s.client, revision); updateErr != nil {
utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))
Copy link
Contributor

Choose a reason for hiding this comment

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

s/error: An //

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed there and elsewhere.

@csrwng
Copy link
Contributor

csrwng commented Dec 19, 2016

One really minor comment, otherwise LGTM

@openshift-bot
Copy link
Contributor

Evaluated for origin testextended up to b4be35c

@bparees
Copy link
Contributor Author

bparees commented Dec 19, 2016

flake #11016
[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to b4be35c

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/12493/) (Base Commit: 3d9cf71)

@bparees
Copy link
Contributor Author

bparees commented Dec 19, 2016

[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to b4be35c

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/testextended FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin_extended/928/) (Base Commit: 476887d) (Extended Tests: core(builds|image_ecosystem))

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 19, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/12508/) (Base Commit: 07050d7) (Image: devenv-rhel7_5571)

@openshift-bot openshift-bot merged commit 3856a1a into openshift:master Dec 19, 2016
@bparees bparees deleted the gitclone branch December 21, 2016 21:49
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