Skip to content
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

Jump to bottom

Git spec handling revamp #771

Merged
merged 4 commits into from
Jul 13, 2017
Merged

Git spec handling revamp #771

merged 4 commits into from
Jul 13, 2017

Conversation

jim-minter
Copy link
Contributor

@gabemontero gabemontero mentioned this pull request Jul 6, 2017
Merged
@jim-minter jim-minter changed the title remove MungeNoProtocolURL as no longer required in origin WIP: git spec handling revamp Jul 7, 2017
@jim-minter jim-minter force-pushed the remove-MungeNoProtocolURL branch from 3b7bced to 560df6a Compare July 7, 2017 13:18
@jim-minter
Copy link
Contributor Author

[test]

@jim-minter jim-minter force-pushed the remove-MungeNoProtocolURL branch 8 times, most recently from 10867d8 to 6884016 Compare July 11, 2017 12:31
@openshift openshift deleted a comment from openshift-bot Jul 11, 2017
@openshift openshift deleted a comment from openshift-bot Jul 11, 2017
@jim-minter jim-minter force-pushed the remove-MungeNoProtocolURL branch from 6884016 to a424c3b Compare July 11, 2017 12:58
@openshift openshift deleted a comment from openshift-bot Jul 11, 2017
@openshift openshift deleted a comment from openshift-bot Jul 11, 2017
@jim-minter jim-minter force-pushed the remove-MungeNoProtocolURL branch 3 times, most recently from 29bdf39 to fd7e384 Compare July 12, 2017 10:40
@openshift openshift deleted a comment from openshift-bot Jul 12, 2017
@openshift openshift deleted a comment from openshift-bot Jul 12, 2017
@jim-minter jim-minter force-pushed the remove-MungeNoProtocolURL branch from fd7e384 to 7ca38b3 Compare July 12, 2017 12:20
@openshift openshift deleted a comment from openshift-bot Jul 12, 2017
@openshift openshift deleted a comment from openshift-bot Jul 12, 2017
@jim-minter jim-minter force-pushed the remove-MungeNoProtocolURL branch from 7ca38b3 to 1573292 Compare July 12, 2017 13:01
@openshift openshift deleted a comment from openshift-bot Jul 12, 2017
@openshift openshift deleted a comment from openshift-bot Jul 12, 2017
@bparees
Copy link
Contributor

bparees commented Jul 12, 2017

/cc @deads2k this change will have to be bumped into origin once it merges here (at least so i assume, i haven't looked at exactly what @jim-minter has done yet)

@jim-minter jim-minter force-pushed the remove-MungeNoProtocolURL branch 2 times, most recently from 8075a9e to a7b503b Compare July 12, 2017 14:24
@openshift openshift deleted a comment from openshift-bot Jul 12, 2017
@openshift openshift deleted a comment from openshift-bot Jul 12, 2017
@jim-minter jim-minter force-pushed the remove-MungeNoProtocolURL branch from a7b503b to 8db8142 Compare July 12, 2017 14:53
@openshift openshift deleted a comment from openshift-bot Jul 12, 2017
@openshift openshift deleted a comment from openshift-bot Jul 12, 2017
@jim-minter jim-minter force-pushed the remove-MungeNoProtocolURL branch from 8db8142 to e4b3a53 Compare July 12, 2017 15:12
@jim-minter jim-minter changed the title WIP: git spec handling revamp Git spec handling revamp Jul 12, 2017
@jim-minter
Copy link
Contributor Author

@bparees ptal...

@jim-minter
Copy link
Contributor Author

@openshift/devex fyi

bparees
bparees requested changes Jul 12, 2017
View reviewed changes
Copy link
Contributor

@bparees bparees left a comment

Choose a reason for hiding this comment

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

a few nits. also i hate to mention this but after this merges you're going to need to backport it to the 3.6.0 branch before doing the bump into origin (which will be delivered to the origin 3.6.x branch once it exists).

hack/test-stirunimage.sh
test_debug "s2i build with relative path with file://"

s2i build file://./cakephp-ex openshift/php-55-centos7 test --loglevel=5 &> "${WORK_DIR}/s2i-rel-proto.log"
check_result $? "${WORK_DIR}/s2i-rel-proto.log"
Copy link
Contributor

Choose a reason for hiding this comment

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

do we have a test for a relative path without file:// ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, under the section marked "s2i build with relative path without file://" :-)

pkg/build/config.go Outdated
config.Source = repo
source, err := git.Parse(repo)
if err != nil {
return fmt.Errorf("couldn't parse label %q: %v", api.DefaultNamespace+"source-location", err)
Copy link
Contributor

Choose a reason for hiding this comment

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

should print the value of the label too. (unless the err will always contain that already) but i don't love that coupling.

Copy link
Contributor

Choose a reason for hiding this comment

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

also should be "build.source-location"

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 - thanks

@jim-minter jim-minter force-pushed the remove-MungeNoProtocolURL branch from e4b3a53 to 7da3d3e Compare July 13, 2017 08:10
@openshift-bot
Copy link
Contributor

Evaluated for source to image test up to 7da3d3e

@jim-minter jim-minter mentioned this pull request Jul 13, 2017
Merged
@openshift-bot
Copy link
Contributor

Source To Image Test Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_s2i/596/) (Base Commit: fdcbd68) (PR Branch Commit: 7da3d3e)

@bparees
Copy link
Contributor

bparees commented Jul 13, 2017

[merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Jul 13, 2017 •
edited
Loading

Source To Image Merge Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_s2i/596/) (Base Commit: fdcbd68) (PR Branch Commit: 7da3d3e)

@openshift-bot
Copy link
Contributor

Evaluated for source to image merge up to 7da3d3e

@openshift-bot openshift-bot merged commit f80867c into openshift:master Jul 13, 2017
@wozniakjan wozniakjan mentioned this pull request May 17, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bparees bparees bparees approved these changes

Assignees

@bparees bparees

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jim-minter @bparees @openshift-bot