Skip to content

Update debug#20257

Merged
openshift-merge-robot merged 6 commits intoopenshift:masterfrom
juanvallejo:soltysh-debug
Jul 10, 2018
Merged

Update debug#20257
openshift-merge-robot merged 6 commits intoopenshift:masterfrom
juanvallejo:soltysh-debug

Conversation

@juanvallejo
Copy link
Contributor

@juanvallejo juanvallejo commented Jul 9, 2018

/assign deads2k

Pick of #20215 on latest master.

@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jul 9, 2018
@juanvallejo juanvallejo changed the title Soltysh debug Update debug Jul 9, 2018
@deads2k
Copy link
Contributor

deads2k commented Jul 9, 2018

/retest

@deads2k
Copy link
Contributor

deads2k commented Jul 9, 2018

last commit is fine, the rest was already tagged.

/lgtm

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 9, 2018
@openshift-bot
Copy link
Contributor

openshift-bot commented Jul 9, 2018

/retest

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

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jul 9, 2018
juanvallejo
juanvallejo commented Jul 9, 2018
View reviewed changes
pkg/oc/cli/cmd/debug.go Outdated
if (o.PrintFlags.OutputFormat != nil && len(*o.PrintFlags.OutputFormat) > 0) ||
(o.PrintFlags.TemplatePrinterFlags != nil && o.PrintFlags.TemplatePrinterFlags.TemplateArgument != nil) {
(o.PrintFlags.TemplatePrinterFlags != nil && o.PrintFlags.TemplatePrinterFlags.TemplateArgument != nil &&
len(*o.PrintFlags.TemplatePrinterFlags.TemplateArgument) > 0) {
Copy link
Contributor Author

@juanvallejo juanvallejo Jul 9, 2018

Choose a reason for hiding this comment

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

@deads2k Updated this to also take into account when a template arg has been specified. Was making debug.sh fail

Copy link
Contributor

@deads2k deads2k Jul 9, 2018

Choose a reason for hiding this comment

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

@deads2k Updated this to also take into account when a template arg has been specified. Was making debug.sh fail

break these apart into bool assignments so I can read them here without the nesting.

Copy link
Contributor Author

@juanvallejo juanvallejo Jul 9, 2018

Choose a reason for hiding this comment

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

Done

@juanvallejo juanvallejo force-pushed the soltysh-debug branch 2 times, most recently from 260e610 to 882d059 Compare July 9, 2018 16:11
@juanvallejo
Copy link
Contributor Author

juanvallejo commented Jul 9, 2018

/test cmd

@deads2k deads2k mentioned this pull request Jul 9, 2018
Closed
deads2k
deads2k reviewed Jul 9, 2018
View reviewed changes
pkg/oc/cli/cmd/debug.go
// TODO: below should be turned into a method on PrintFlags
if (o.PrintFlags.OutputFormat != nil && len(*o.PrintFlags.OutputFormat) > 0) ||
(o.PrintFlags.TemplatePrinterFlags != nil && o.PrintFlags.TemplatePrinterFlags.TemplateArgument != nil) {
if outputFormatSpecified || templateArgSpecified {
Copy link
Contributor

@deads2k deads2k Jul 9, 2018

Choose a reason for hiding this comment

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

what a bizarre command.

@deads2k
Copy link
Contributor

deads2k commented Jul 9, 2018

/lgtm

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

openshift-ci-robot commented Jul 9, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, juanvallejo

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-bot
Copy link
Contributor

openshift-bot commented Jul 9, 2018

/test cross

@juanvallejo
Copy link
Contributor Author

juanvallejo commented Jul 10, 2018

/test verify

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 10, 2018

New changes are detected. LGTM label has been removed.

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jul 10, 2018
@juanvallejo
Copy link
Contributor Author

juanvallejo commented Jul 10, 2018

@deads2k had to rebase to get completions updated / test verify passing

@juanvallejo juanvallejo added the lgtm Indicates that a PR is ready to be merged. label Jul 10, 2018
@openshift-bot
Copy link
Contributor

openshift-bot commented Jul 10, 2018

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit 528fc4b into openshift:master Jul 10, 2018
@juanvallejo juanvallejo deleted the soltysh-debug branch July 10, 2018 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@deads2k deads2k deads2k left review comments

@enj enj Awaiting requested review from enj

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees

@deads2k deads2k

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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@juanvallejo @deads2k @openshift-bot @openshift-ci-robot @openshift-merge-robot @soltysh