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

Fix helm test #356

Merged
merged 4 commits into from
Jan 31, 2018
Merged

Fix helm test #356

merged 4 commits into from
Jan 31, 2018

Conversation

jose5918
Copy link
Contributor

@jose5918 jose5918 commented Jan 30, 2018

Helm test was failing because validation for a tfjob required that replicaSpecs for a Parameter server specify a template. Helm test failure also was not reported.

Changes made:

  • Updated e2e tests and examples to include a template for the PS replicaSpec
  • Check for None before concatenating the error.

Fixes #351 and #355


This change is Reviewable

@k8s-ci-robot
Copy link

Hi @jose5918. Thanks for your PR.

I'm waiting for a kubernetes or tensorflow member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@karthikvadla
Copy link

@jose5918 Hey Jose, Can you please update the spec here too
https://github.com/tensorflow/k8s/blob/master/examples/tf_job.yaml#L24 (This will fix example-job)
https://github.com/tensorflow/k8s/blob/master/test/e2e/simple_job.yaml.template#L24 (Not sure whether we are using this template, but to make it consistent you can update here too)

@coveralls
Copy link

coveralls commented Jan 30, 2018

Coverage Status

Coverage remained the same at 31.746% when pulling 1e10f2b on jose5918:helm_test into 7f97cf0 on tensorflow:master.

Copy link
Contributor

@jlewi jlewi left a comment

Choose a reason for hiding this comment

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

Could you update the PR description to provide more info about what the problem was and the fix?

py/deploy.py Outdated
@@ -114,7 +114,7 @@ def test(args):
start = time.time()
util.run(["helm", "test", "tf-job"])
except subprocess.CalledProcessError as e:
t.failure = "helm test failed;\n" + e.output
t.failure = "helm test failed;\n" + (e.output or '')
Copy link
Contributor

Choose a reason for hiding this comment

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

use " not ' to be consistent with the rest of the 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.

@jlewi Sorry I don't follow. I don't see not in the rest of the file
Do you mean like an if else statement?

if not e:
  t.failure = "helm test failed;\n"
else:
  t.failure = "helm test failed;\n" + e.output

Copy link
Contributor

Choose a reason for hiding this comment

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

I was referring to the quotation marks. We are using double quotes not single quotes in this file so we should be consistent.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah got it

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jlewi Ok this should be addressed

@jlewi
Copy link
Contributor

jlewi commented Jan 30, 2018

/ok-to-test

@jlewi
Copy link
Contributor

jlewi commented Jan 30, 2018

I confirmed the test is passing in Airflow.

@jlewi
Copy link
Contributor

jlewi commented Jan 30, 2018

Thanks for the fix!
I'll merge this as soon as the tests finish running.

@jlewi jlewi merged commit cabc1c0 into kubeflow:master Jan 31, 2018
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.

5 participants