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

--source-image should count as a source input #18631

Merged
merged 1 commit into from
Feb 18, 2018
Merged

--source-image should count as a source input #18631

merged 1 commit into from
Feb 18, 2018

Conversation

coreydaley
Copy link
Member

@coreydaley coreydaley commented Feb 15, 2018 •
edited
Loading

  • the --source-image flag should count as a source input
  • the --strategy flag should override the build strategy in all source repositories

Fixes #17675

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 15, 2018
@coreydaley coreydaley removed the request for review from gabemontero February 15, 2018 19:11
@coreydaley
Copy link
Member Author

/retest

1 similar comment
@coreydaley
Copy link
Member Author

/retest

@coreydaley coreydaley changed the title [WIP] --source-image should count as a source input --source-image should count as a source input Feb 15, 2018
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 15, 2018
@coreydaley
Copy link
Member Author

@openshift/sig-developer-experience ptal
if this makes sense I will figure out some tests around the change

@bparees
Copy link
Contributor

bparees commented Feb 15, 2018

not seeing how this would fix --binary is ignoring the --strategy=docker flag (it created an s2i strategy build) ?

but the reordering makes sense for the providing an image input should count for purposes of supplying "source" (you shouldn't have to pass --binary to trick oc new-build into creating the build w/o providing an explicit source repo) part of the issue.

@bparees bparees self-assigned this Feb 15, 2018
@bparees bparees added this to the 3.10.0 milestone Feb 15, 2018
@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 16, 2018
@coreydaley
Copy link
Member Author

@bparees ptal

bparees
bparees reviewed Feb 16, 2018
View reviewed changes
test/cmd/newapp.sh
# ensure that --strategy sets the build strategy
os::cmd::expect_success_and_text 'oc new-build --name sourcetest python~https://github.com/sclorg/django-ex --source-image centos:latest --source-image-path /tmp --strategy source --dry-run -o yaml' 'sourceStrategy'
os::cmd::expect_success_and_text 'oc new-build --name sourcetest python~https://github.com/sclorg/django-ex --source-image centos:latest --source-image-path /tmp --strategy pipeline --dry-run -o yaml' 'jenkinsPipelineStrategy'
os::cmd::expect_success_and_text 'oc new-build --name sourcetest python~https://github.com/sclorg/django-ex --source-image centos:latest --source-image-path /tmp --strategy docker --dry-run -o yaml' 'dockerStrategy'
Copy link
Contributor

Choose a reason for hiding this comment

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

can you also add a test that confirms you can create a build with just image inputs (w/o passing the --binary flag)?

Copy link
Member Author

Choose a reason for hiding this comment

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

updated

@coreydaley
the --source-image flag should count as a source input
a13dcdf 
the --strategy flag should override the build strategy in all source repositories

Fixes #17675
@coreydaley
Copy link
Member Author

/retest

@coreydaley
Copy link
Member Author

@bparees ptal

@bparees
Copy link
Contributor

bparees commented Feb 17, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 17, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees, coreydaley

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 17, 2018
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit a303fa3 into openshift:master Feb 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bparees bparees bparees left review comments

Assignees

@bparees bparees

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. sig/developer-experience size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v3.10
Development

Successfully merging this pull request may close these issues.
5 participants
@coreydaley @bparees @openshift-ci-robot @openshift-bot @openshift-merge-robot