Skip to content

Commit

Permalink
Fix tfjob test; the simple tfjob test prototype was renamed. (kubeflo…
Browse files Browse the repository at this point in the history
…w#1267)

* Fix tfjob test; the simple tfjob test prototype was renamed.

* kubeflow/trainer#749 renamed the prototype
* ksonnet just fails silently if the component doesn't exist so the test just ends up failing with 404 trying to wait for the job.
* Fix 1266
* Update the test to use v1alpha2 for tf_job_version.
* Remove code to run v1alpha1 and v1alpha2; we can only run one version because only 1 CRD version can be installed in the cluster.
* The default should be v1alpha2 so lets just test that.
* Don't use the mnist image with v1alpha2; use tf_smoke and use the image
  set in the job prototype.

* Fix ksonnet error.
  • Loading branch information
jlewi authored and k8s-ci-robot committed Jul 26, 2018
1 parent 7b16bef commit 147e424
Showing 1 changed file with 3 additions and 23 deletions.
26 changes: 3 additions & 23 deletions testing/workflows/components/workflows.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,7 @@
{},
{
name: "tfjob-test",
template:
if platform == "minikube" then
"tfjob-test"
else
"tfjob-test" + v1alpha2Suffix
template: "tfjob-test" + v1alpha2Suffix
,
dependencies: [
if platform == "minikube" then
Expand Down Expand Up @@ -408,22 +404,6 @@
"testing.tf_job_simple_test",
"--src_dir=" + srcDir,
]), // tfjob-simple-prototype-test
buildTemplate("tfjob-test", [
"python",
"-m",
"py.test_runner",
"test",
"--cluster=" + cluster,
"--zone=" + zone,
"--project=" + project,
"--app_dir=" + tfOperatorRoot + "/test/workflows",
"--tfjob_version=v1alpha1",
"--component=simple_tfjob",
// Name is used for the test case name so it should be unique across
// all E2E tests.
"--params=name=simple-tfjob-" + platform + ",namespace=" + stepsNamespace + ",apiVersion=kubeflow.org/" + "v1alpha1" + ",image=" + "gcr.io/tf-on-k8s-dogfood/tf_sample:dc944ff",
"--junit_path=" + artifactsDir + "/junit_e2e-" + platform + ".xml",
]), // run tests
buildTemplate("tfjob-test" + v1alpha2Suffix, [
"python",
"-m",
Expand All @@ -434,10 +414,10 @@
"--project=" + project,
"--app_dir=" + tfOperatorRoot + "/test/workflows",
"--tfjob_version=v1alpha2",
"--component=simple_tfjob",
"--component=simple_tfjob_v1alpha2",
// Name is used for the test case name so it should be unique across
// all E2E tests.
"--params=name=simple-tfjob-" + platform + ",namespace=" + stepsNamespace + ",apiVersion=kubeflow.org/" + "v1alpha2" + ",image=" + "gcr.io/kubeflow-ci/tf-dist-mnist-test:1.0",
"--params=name=simple-tfjob-" + platform + ",namespace=" + stepsNamespace,
"--junit_path=" + artifactsDir + "/junit_e2e-" + platform + v1alpha2Suffix + ".xml",
]), // run tests
buildTemplate("pytorchjob-deploy", [
Expand Down

0 comments on commit 147e424

Please sign in to comment.