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.

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

Throw error using --context-dir with a template #15019

Merged
merged 1 commit into from
Jul 6, 2017
Merged

Throw error using --context-dir with a template #15019

merged 1 commit into from
Jul 6, 2017

Conversation

coreydaley
Copy link
Member

--context-dir is not supported when using a template with oc new-app

Fixes #14960

@coreydaley
Copy link
Member Author

[test][testextended][extended:core(builds)]

@coreydaley
Copy link
Member Author

@bparees ptal

@openshift openshift deleted a comment from openshift-bot Jul 3, 2017

if len(c.ContextDir) > 0 && len(c.TemplateFiles) > 0 {
return nil, errors.New("--context-dir is not supported when using a template")
}
Copy link
Contributor

Choose a reason for hiding this comment

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

just to confirm, c.TemplateFiles is populated for all of the following conditions:

  1. "oc new-app mylocaltemplate.yaml"
  2. "oc new-app -f mylocaltemplate.yaml"
  3. "oc new-app http://myremote/template.yaml"
  4. "oc new-app -f http://myremote/template.yaml"
  5. "oc new-app myclustertemplate"

?

Copy link
Member Author

Choose a reason for hiding this comment

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

Doesn't look like it, fixed in next push

@bparees bparees self-assigned this Jul 4, 2017
@bparees
Copy link
Contributor

bparees commented Jul 5, 2017

what does this actually output when a user hits it?

@coreydaley
Copy link
Member Author

@bparees --context-dir is not supported when using a template

@bparees
Copy link
Contributor

bparees commented Jul 5, 2017

@coreydaley i mean the literal output. i want to see what the user is going to see in terms of full output based on where you're throwing the error.

@coreydaley
Copy link
Member Author

@coreydaley
Copy link
Member Author

@bparees

[09:49] $ oc new-app rails-postgresql.json --context-dir=blah
error: --context-dir is not supported when using a template

@bparees
Copy link
Contributor

bparees commented Jul 5, 2017

lgtm, please add a TC to newapp.sh

@coreydaley
Copy link
Member Author

test/flake #14575

@bparees
Copy link
Contributor

bparees commented Jul 5, 2017

[merge]

--context-dir is not supported when using a template with oc new-app

Fixes #14960
@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 0a4fc41

@bparees
Copy link
Contributor

bparees commented Jul 5, 2017

[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin testextended up to 0a4fc41

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/2970/) (Base Commit: be5e626) (PR Branch Commit: 0a4fc41)

@bparees
Copy link
Contributor

bparees commented Jul 5, 2017

flake #15059
[merge]

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/testextended SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin_extended/820/) (Base Commit: be5e626) (PR Branch Commit: 0a4fc41) (Extended Tests: core(builds))

@bparees
Copy link
Contributor

bparees commented Jul 5, 2017

[merge][severity:lowrisk]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 0a4fc41

@openshift-bot
Copy link
Contributor

openshift-bot commented Jul 5, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/1237/) (Base Commit: 72b9f3d) (PR Branch Commit: 0a4fc41) (Image: devenv-rhel7_6427)

@openshift-bot openshift-bot merged commit 071f2c1 into openshift:master Jul 6, 2017
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