Add sample test without image build (#578)

* add another sample test to test the current sample codes instead of using newly built component images

* rename sample test yamls

* use the v2 name

* bash bug

* tf-training bug fix

* output argo log in case of exceptions for tf-training sample

* disable gpu

samples/kubeflow-tf/kubeflow-training-classification.py

@@ -52,7 +52,7 @@ def kubeflow_tf_training_op(transformed_data_dir, schema: 'GcsUri[text/json]', l
         file_outputs = {'train': '/output.txt'}
     )
     if use_gpu:
-        kubeflow_tf_training_op.image = 'gcr.io/ml-pipeline/ml-pipeline-kubeflow-tf-trainer-gpu:85c6413a2e13da4b8f198aeac1abc2f3a74fe789',
+        kubeflow_tf_training_op.image = 'gcr.io/ml-pipeline/ml-pipeline-kubeflow-tf-trainer-gpu:85c6413a2e13da4b8f198aeac1abc2f3a74fe789'
         kubeflow_tf_training_op.set_gpu_limit(1)
     
     return kubeflow_tf_training_op
@@ -102,7 +102,7 @@ def kubeflow_training(output, project,
   # TODO: use the argo job name as the workflow
   workflow = '{{workflow.name}}'
   # set the flag to use GPU trainer
-  use_gpu = True
+  use_gpu = False
 
   preprocess = dataflow_tf_transform_op(train, evaluation, schema, project, preprocess_mode, '', '%s/%s/transformed' % (output, workflow)).apply(gcp.use_gcp_secret('user-gcp-sa'))
   training = kubeflow_tf_training_op(preprocess.output, schema, learning_rate, hidden_layer_size, steps, target, '', '%s/%s/train' % (output, workflow), use_gpu=use_gpu).apply(gcp.use_gcp_secret('user-gcp-sa'))

test/sample-test/run_kubeflow_test.py

@@ -86,17 +86,18 @@ def main():
   ###### Monitor Job ######
   start_time = datetime.now()
   response = client.wait_for_run_completion(run_id, 1200)
-  succ = (response.run.status.lower()=='succeeded')
+  try:
-  end_time = datetime.now()
+    succ = (response.run.status.lower()=='succeeded')
-  elapsed_time = (end_time - start_time).seconds
+    end_time = datetime.now()
-  utils.add_junit_test(test_cases, 'job completion', succ, 'waiting for job completion failure', elapsed_time)
+    elapsed_time = (end_time - start_time).seconds
-
+    utils.add_junit_test(test_cases, 'job completion', succ, 'waiting for job completion failure', elapsed_time)
-  ###### Output Argo Log for Debugging ######
+  finally:
-  workflow_json = client._get_workflow_json(run_id)
+    ###### Output Argo Log for Debugging ######
-  workflow_id = workflow_json['metadata']['name']
+    workflow_json = client._get_workflow_json(run_id)
-  argo_log, _ = utils.run_bash_command('argo logs -n {} -w {}'.format(args.namespace, workflow_id))
+    workflow_id = workflow_json['metadata']['name']
-  print("=========Argo Workflow Log=========")
+    argo_log, _ = utils.run_bash_command('argo logs -n {} -w {}'.format(args.namespace, workflow_id))
-  print(argo_log)
+    print("=========Argo Workflow Log=========")
+    print(argo_log)
 
   if not succ:
     utils.write_junit_xml(test_name, args.result, test_cases)

test/sample-test/run_test.sh

@@ -146,10 +146,12 @@ if [ "$TEST_NAME" == 'tf-training' ]; then
   # Compile samples
   cd ${BASE_DIR}/samples/kubeflow-tf
 
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataflow-tft:\([a-zA-Z0-9_.-]\)\+|${DATAFLOW_TFT_IMAGE}|g" kubeflow-training-classification.py
+  if [ -n "${DATAFLOW_TFT_IMAGE}" ];then
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-kubeflow-tf-trainer:\([a-zA-Z0-9_.-]\)\+|${KUBEFLOW_DNNTRAINER_IMAGE}|g" kubeflow-training-classification.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataflow-tft:\([a-zA-Z0-9_.-]\)\+|${DATAFLOW_TFT_IMAGE}|g" kubeflow-training-classification.py
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataflow-tf-predict:\([a-zA-Z0-9_.-]\)\+|${DATAFLOW_PREDICT_IMAGE}|g" kubeflow-training-classification.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-kubeflow-tf-trainer:\([a-zA-Z0-9_.-]\)\+|${KUBEFLOW_DNNTRAINER_IMAGE}|g" kubeflow-training-classification.py
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-local-confusion-matrix:\([a-zA-Z0-9_.-]\)\+|${LOCAL_CONFUSIONMATRIX_IMAGE}|g" kubeflow-training-classification.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataflow-tf-predict:\([a-zA-Z0-9_.-]\)\+|${DATAFLOW_PREDICT_IMAGE}|g" kubeflow-training-classification.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-local-confusion-matrix:\([a-zA-Z0-9_.-]\)\+|${LOCAL_CONFUSIONMATRIX_IMAGE}|g" kubeflow-training-classification.py
+  fi
 
   dsl-compile --py kubeflow-training-classification.py --output kubeflow-training-classification.tar.gz
 
@@ -165,14 +167,16 @@ elif [ "$TEST_NAME" == "tfx" ]; then
   # Compile samples
   cd ${BASE_DIR}/samples/tfx
 
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataflow-tft:\([a-zA-Z0-9_.-]\)\+|${DATAFLOW_TFT_IMAGE}|g" taxi-cab-classification-pipeline.py
+  if [ -n "${DATAFLOW_TFT_IMAGE}" ];then
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataflow-tf-predict:\([a-zA-Z0-9_.-]\)\+|${DATAFLOW_PREDICT_IMAGE}|g" taxi-cab-classification-pipeline.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataflow-tft:\([a-zA-Z0-9_.-]\)\+|${DATAFLOW_TFT_IMAGE}|g" taxi-cab-classification-pipeline.py
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataflow-tfdv:\([a-zA-Z0-9_.-]\)\+|${DATAFLOW_TFDV_IMAGE}|g" taxi-cab-classification-pipeline.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataflow-tf-predict:\([a-zA-Z0-9_.-]\)\+|${DATAFLOW_PREDICT_IMAGE}|g" taxi-cab-classification-pipeline.py
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataflow-tfma:\([a-zA-Z0-9_.-]\)\+|${DATAFLOW_TFMA_IMAGE}|g" taxi-cab-classification-pipeline.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataflow-tfdv:\([a-zA-Z0-9_.-]\)\+|${DATAFLOW_TFDV_IMAGE}|g" taxi-cab-classification-pipeline.py
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-kubeflow-tf-trainer:\([a-zA-Z0-9_.-]\)\+|${KUBEFLOW_DNNTRAINER_IMAGE}|g" taxi-cab-classification-pipeline.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataflow-tfma:\([a-zA-Z0-9_.-]\)\+|${DATAFLOW_TFMA_IMAGE}|g" taxi-cab-classification-pipeline.py
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-kubeflow-deployer:\([a-zA-Z0-9_.-]\)\+|${KUBEFLOW_DEPLOYER_IMAGE}|g" taxi-cab-classification-pipeline.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-kubeflow-tf-trainer:\([a-zA-Z0-9_.-]\)\+|${KUBEFLOW_DNNTRAINER_IMAGE}|g" taxi-cab-classification-pipeline.py
-   sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-local-confusion-matrix:\([a-zA-Z0-9_.-]\)\+|${LOCAL_CONFUSIONMATRIX_IMAGE}|g" taxi-cab-classification-pipeline.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-kubeflow-deployer:\([a-zA-Z0-9_.-]\)\+|${KUBEFLOW_DEPLOYER_IMAGE}|g" taxi-cab-classification-pipeline.py
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-local-roc:\([a-zA-Z0-9_.-]\)\+|${LOCAL_ROC_IMAGE}|g" taxi-cab-classification-pipeline.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-local-confusion-matrix:\([a-zA-Z0-9_.-]\)\+|${LOCAL_CONFUSIONMATRIX_IMAGE}|g" taxi-cab-classification-pipeline.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-local-roc:\([a-zA-Z0-9_.-]\)\+|${LOCAL_ROC_IMAGE}|g" taxi-cab-classification-pipeline.py
+  fi
 
   dsl-compile --py taxi-cab-classification-pipeline.py --output taxi-cab-classification-pipeline.tar.gz
   cd "${TEST_DIR}"
@@ -251,15 +255,16 @@ elif [ "$TEST_NAME" == "xgboost" ]; then
   # Compile samples
   cd ${BASE_DIR}/samples/xgboost-spark
 
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataproc-create-cluster:\([a-zA-Z0-9_.-]\)\+|${DATAPROC_CREATE_CLUSTER_IMAGE}|g" xgboost-training-cm.py
+  if [ -n "${DATAPROC_CREATE_CLUSTER_IMAGE}" ];then
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataproc-delete-cluster:\([a-zA-Z0-9_.-]\)\+|${DATAPROC_DELETE_CLUSTER_IMAGE}|g" xgboost-training-cm.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataproc-create-cluster:\([a-zA-Z0-9_.-]\)\+|${DATAPROC_CREATE_CLUSTER_IMAGE}|g" xgboost-training-cm.py
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataproc-analyze:\([a-zA-Z0-9_.-]\)\+|${DATAPROC_ANALYZE_IMAGE}|g" xgboost-training-cm.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataproc-delete-cluster:\([a-zA-Z0-9_.-]\)\+|${DATAPROC_DELETE_CLUSTER_IMAGE}|g" xgboost-training-cm.py
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataproc-transform:\([a-zA-Z0-9_.-]\)\+|${DATAPROC_TRANSFORM_IMAGE}|g" xgboost-training-cm.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataproc-analyze:\([a-zA-Z0-9_.-]\)\+|${DATAPROC_ANALYZE_IMAGE}|g" xgboost-training-cm.py
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataproc-train:\([a-zA-Z0-9_.-]\)\+|${DATAPROC_TRAIN_IMAGE}|g" xgboost-training-cm.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataproc-transform:\([a-zA-Z0-9_.-]\)\+|${DATAPROC_TRANSFORM_IMAGE}|g" xgboost-training-cm.py
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataproc-predict:\([a-zA-Z0-9_.-]\)\+|${DATAPROC_PREDICT_IMAGE}|g" xgboost-training-cm.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataproc-train:\([a-zA-Z0-9_.-]\)\+|${DATAPROC_TRAIN_IMAGE}|g" xgboost-training-cm.py
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-local-roc:\([a-zA-Z0-9_.-]\)\+|${LOCAL_ROC_IMAGE}|g" xgboost-training-cm.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-dataproc-predict:\([a-zA-Z0-9_.-]\)\+|${DATAPROC_PREDICT_IMAGE}|g" xgboost-training-cm.py
-  sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-local-confusion-matrix:\([a-zA-Z0-9_.-]\)\+|${LOCAL_CONFUSIONMATRIX_IMAGE}|g" xgboost-training-cm.py
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-local-roc:\([a-zA-Z0-9_.-]\)\+|${LOCAL_ROC_IMAGE}|g" xgboost-training-cm.py
-
+    sed -i -e "s|gcr.io/ml-pipeline/ml-pipeline-local-confusion-matrix:\([a-zA-Z0-9_.-]\)\+|${LOCAL_CONFUSIONMATRIX_IMAGE}|g" xgboost-training-cm.py
+  fi
   dsl-compile --py xgboost-training-cm.py --output xgboost-training-cm.tar.gz
 
   cd "${TEST_DIR}"
@@ -281,13 +286,21 @@ elif [ "$TEST_NAME" == "notebook-tfx" ]; then
   cd ${BASE_DIR}/samples/notebooks
   export LC_ALL=C.UTF-8
   export LANG=C.UTF-8
-  papermill --prepare-only -p EXPERIMENT_NAME notebook-tfx-test -p OUTPUT_DIR ${RESULTS_GCS_DIR} -p PROJECT_NAME ml-pipeline-test \
+  if [ -n "${DATAFLOW_TFT_IMAGE}" ];then
-   -p BASE_IMAGE ${TARGET_IMAGE_PREFIX}pusherbase:dev -p TARGET_IMAGE ${TARGET_IMAGE_PREFIX}pusher:dev \
+    papermill --prepare-only -p EXPERIMENT_NAME notebook-tfx-test -p OUTPUT_DIR ${RESULTS_GCS_DIR} -p PROJECT_NAME ml-pipeline-test \
-   -p KFP_PACKAGE /tmp/kfp.tar.gz -p DEV_DEPLOYER_MODEL ${DEV_DEPLOYER_MODEL}.${MODEL_VERSION} -p PROD_DEPLOYER_MODEL ${PROD_DEPLOYER_MODEL}.${MODEL_VERSION} \
+      -p BASE_IMAGE ${TARGET_IMAGE_PREFIX}pusherbase:dev -p TARGET_IMAGE ${TARGET_IMAGE_PREFIX}pusher:dev \
-   -p DATAFLOW_TFDV_IMAGE ${DATAFLOW_TFDV_IMAGE} -p DATAFLOW_TFT_IMAGE ${DATAFLOW_TFT_IMAGE} -p DATAFLOW_TFMA_IMAGE ${DATAFLOW_TFMA_IMAGE} -p DATAFLOW_TF_PREDICT_IMAGE ${DATAFLOW_PREDICT_IMAGE} \
+      -p KFP_PACKAGE /tmp/kfp.tar.gz -p DEV_DEPLOYER_MODEL ${DEV_DEPLOYER_MODEL}.${MODEL_VERSION} -p PROD_DEPLOYER_MODEL ${PROD_DEPLOYER_MODEL}.${MODEL_VERSION} \
-   -p KUBEFLOW_TF_TRAINER_IMAGE ${KUBEFLOW_DNNTRAINER_IMAGE} -p KUBEFLOW_DEPLOYER_IMAGE ${KUBEFLOW_DEPLOYER_IMAGE} \
+      -p DATAFLOW_TFDV_IMAGE ${DATAFLOW_TFDV_IMAGE} -p DATAFLOW_TFT_IMAGE ${DATAFLOW_TFT_IMAGE} -p DATAFLOW_TFMA_IMAGE ${DATAFLOW_TFMA_IMAGE} -p DATAFLOW_TF_PREDICT_IMAGE ${DATAFLOW_PREDICT_IMAGE} \
-   -p TRAIN_DATA gs://ml-pipeline-dataset/sample-test/taxi-cab-classification/train50.csv -p EVAL_DATA gs://ml-pipeline-dataset/sample-test/taxi-cab-classification/eval20.csv \
+      -p KUBEFLOW_TF_TRAINER_IMAGE ${KUBEFLOW_DNNTRAINER_IMAGE} -p KUBEFLOW_DEPLOYER_IMAGE ${KUBEFLOW_DEPLOYER_IMAGE} \
-   -p HIDDEN_LAYER_SIZE 10 -p STEPS 50 KubeFlow\ Pipeline\ Using\ TFX\ OSS\ Components.ipynb notebook-tfx.ipynb
+      -p TRAIN_DATA gs://ml-pipeline-dataset/sample-test/taxi-cab-classification/train50.csv -p EVAL_DATA gs://ml-pipeline-dataset/sample-test/taxi-cab-classification/eval20.csv \
+      -p HIDDEN_LAYER_SIZE 10 -p STEPS 50 KubeFlow\ Pipeline\ Using\ TFX\ OSS\ Components.ipynb notebook-tfx.ipynb
+  else
+    papermill --prepare-only -p EXPERIMENT_NAME notebook-tfx-test -p OUTPUT_DIR ${RESULTS_GCS_DIR} -p PROJECT_NAME ml-pipeline-test \
+      -p BASE_IMAGE ${TARGET_IMAGE_PREFIX}pusherbase:dev -p TARGET_IMAGE ${TARGET_IMAGE_PREFIX}pusher:dev \
+      -p KFP_PACKAGE /tmp/kfp.tar.gz -p DEV_DEPLOYER_MODEL ${DEV_DEPLOYER_MODEL}.${MODEL_VERSION} -p PROD_DEPLOYER_MODEL ${PROD_DEPLOYER_MODEL}.${MODEL_VERSION} \
+      -p TRAIN_DATA gs://ml-pipeline-dataset/sample-test/taxi-cab-classification/train50.csv -p EVAL_DATA gs://ml-pipeline-dataset/sample-test/taxi-cab-classification/eval20.csv \
+      -p HIDDEN_LAYER_SIZE 10 -p STEPS 50 KubeFlow\ Pipeline\ Using\ TFX\ OSS\ Components.ipynb notebook-tfx.ipynb
+  fi
   jupyter nbconvert --to python notebook-tfx.ipynb
   pip3 install tensorflow==1.8.0
   ipython notebook-tfx.py

test/sample_test_components.yaml

@@ -0,0 +1,548 @@
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: argoproj.io/v1alpha1
+kind: Workflow
+metadata:
+  generateName: sample-test-
+spec:
+  entrypoint: sample-test
+  volumes:
+  - name: gcp-credentials
+    secret:
+      secretName: user-gcp-sa
+  arguments:
+    parameters:
+    - name: image-build-context-gcs-uri
+    - name: target-image-prefix
+    - name: test-results-gcs-dir
+    - name: dataflow-tft-image-suffix
+      value: dataflow-tft
+    - name: dataflow-predict-image-suffix
+      value: dataflow-predict
+    - name: dataflow-tfma-image-suffix
+      value: dataflow-tfma
+    - name: dataflow-tfdv-image-suffix
+      value: dataflow-tfdv
+    - name: dataproc-create-cluster-image-suffix
+      value: dataproc-create-cluster
+    - name: dataproc-delete-cluster-image-suffix
+      value: dataproc-delete-cluster
+    - name: dataproc-analyze-image-suffix
+      value: dataproc-analyze
+    - name: dataproc-transform-image-suffix
+      value: dataproc-transform
+    - name: dataproc-train-image-suffix
+      value: dataproc-train
+    - name: dataproc-predict-image-suffix
+      value: dataproc-predict
+    - name: kubeflow-dnntrainer-image-suffix
+      value: kubeflow-dnntrainer
+    - name: kubeflow-deployer-image-suffix
+      value: kubeflow-deployer
+    - name: local-confusionmatrix-image-suffix
+      value: local-confusionmatrix
+    - name: local-roc-image-suffix
+      value: local-roc
+    - name: sample-tests-image-suffix
+      value: sample-tests
+    - name: namespace
+      value: kubeflow
+  templates:
+  - name: sample-test
+    inputs:
+      parameters:
+      - name: target-image-prefix
+      - name: test-results-gcs-dir
+      - name: dataflow-tft-image-suffix
+      - name: dataflow-predict-image-suffix
+      - name: dataflow-tfma-image-suffix
+      - name: dataflow-tfdv-image-suffix
+      - name: dataproc-create-cluster-image-suffix
+      - name: dataproc-delete-cluster-image-suffix
+      - name: dataproc-analyze-image-suffix
+      - name: dataproc-transform-image-suffix
+      - name: dataproc-train-image-suffix
+      - name: dataproc-predict-image-suffix
+      - name: kubeflow-dnntrainer-image-suffix
+      - name: kubeflow-deployer-image-suffix
+      - name: local-confusionmatrix-image-suffix
+      - name: local-roc-image-suffix
+      - name: sample-tests-image-suffix
+      - name: namespace
+    steps:
+    - - name: build-sample-tests-image
+        template: build-image-by-dockerfile
+        arguments:
+          parameters:
+          - name: docker-path
+            value: .
+          - name: docker-file
+            value: test/sample-test/Dockerfile
+          - name: image-name
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
+      - name: build-dataflow-tft-image
+        template: build-image-by-script
+        arguments:
+          parameters:
+          - name: image-name
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tft-image-suffix}}"
+          - name: build-script
+            value: components/dataflow/tft/build_image.sh
+      - name: build-dataflow-predict-image
+        template: build-image-by-script
+        arguments:
+          parameters:
+          - name: image-name
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-predict-image-suffix}}"
+          - name: build-script
+            value: components/dataflow/predict/build_image.sh
+      - name: build-dataflow-tfma-image
+        template: build-image-by-script
+        arguments:
+          parameters:
+          - name: image-name
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfma-image-suffix}}"
+          - name: build-script
+            value: components/dataflow/tfma/build_image.sh
+      - name: build-dataflow-tfdv-image
+        template: build-image-by-script
+        arguments:
+          parameters:
+          - name: image-name
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfdv-image-suffix}}"
+          - name: build-script
+            value: components/dataflow/tfdv/build_image.sh
+      - name: build-dataproc-create-cluster-image
+        template: build-image-by-script
+        arguments:
+          parameters:
+          - name: image-name
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-create-cluster-image-suffix}}"
+          - name: build-script
+            value: components/dataproc/create_cluster/build_image.sh
+      - name: build-dataproc-delete-cluster-image
+        template: build-image-by-script
+        arguments:
+          parameters:
+          - name: image-name
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-delete-cluster-image-suffix}}"
+          - name: build-script
+            value: components/dataproc/delete_cluster/build_image.sh
+      - name: build-dataproc-analyze-image
+        template: build-image-by-script
+        arguments:
+          parameters:
+          - name: image-name
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-analyze-image-suffix}}"
+          - name: build-script
+            value: components/dataproc/analyze/build_image.sh
+      - name: build-dataproc-transform-image
+        template: build-image-by-script
+        arguments:
+          parameters:
+          - name: image-name
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-transform-image-suffix}}"
+          - name: build-script
+            value: components/dataproc/transform/build_image.sh
+      - name: build-dataproc-train-image
+        template: build-image-by-script
+        arguments:
+          parameters:
+          - name: image-name
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-train-image-suffix}}"
+          - name: build-script
+            value: components/dataproc/train/build_image.sh
+      - name: build-dataproc-predict-image
+        template: build-image-by-script
+        arguments:
+          parameters:
+          - name: image-name
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-predict-image-suffix}}"
+          - name: build-script
+            value: components/dataproc/predict/build_image.sh
+      - name: build-kubeflow-dnntrainer-image
+        template: build-image-by-script
+        arguments:
+          parameters:
+          - name: image-name
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-dnntrainer-image-suffix}}"
+          - name: build-script
+            value: components/kubeflow/dnntrainer/build_image.sh
+      - name: build-kubeflow-deployer-image
+        template: build-image-by-dockerfile
+        arguments:
+          parameters:
+          - name: docker-path
+            value: components/kubeflow/deployer
+          - name: image-name
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-deployer-image-suffix}}"
+      - name: build-local-confusion-matrix
+        template: build-image-by-script
+        arguments:
+          parameters:
+          - name: image-name
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-confusionmatrix-image-suffix}}"
+          - name: build-script
+            value: components/local/confusion_matrix/build_image.sh
+      - name: build-local-roc
+        template: build-image-by-script
+        arguments:
+          parameters:
+          - name: image-name
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-roc-image-suffix}}"
+          - name: build-script
+            value: components/local/roc/build_image.sh
+    - - name: run-tf-training-tests
+        template: run-sample-tests
+        arguments:
+          parameters:
+          - name: test-results-gcs-dir
+            value: "{{inputs.parameters.test-results-gcs-dir}}"
+          - name: target-image-prefix
+            value: "{{inputs.parameters.target-image-prefix}}"
+          - name: dataflow-tft-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tft-image-suffix}}"
+          - name: dataflow-predict-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-predict-image-suffix}}"
+          - name: dataflow-tfma-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfma-image-suffix}}"
+          - name: dataflow-tfdv-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfdv-image-suffix}}"
+          - name: dataproc-create-cluster-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-create-cluster-image-suffix}}"
+          - name: dataproc-delete-cluster-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-delete-cluster-image-suffix}}"
+          - name: dataproc-analyze-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-analyze-image-suffix}}"
+          - name: dataproc-transform-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-transform-image-suffix}}"
+          - name: dataproc-train-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-train-image-suffix}}"
+          - name: dataproc-predict-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-predict-image-suffix}}"
+          - name: kubeflow-dnntrainer-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-dnntrainer-image-suffix}}"
+          - name: kubeflow-deployer-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-deployer-image-suffix}}"
+          - name: local-confusionmatrix-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-confusionmatrix-image-suffix}}"
+          - name: local-roc-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-roc-image-suffix}}"
+          - name: sample-tests-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
+          - name: namespace
+            value: "{{inputs.parameters.namespace}}"
+          - name: test-name
+            value: "tf-training"
+      - name: run-tfx-tests
+        template: run-sample-tests
+        arguments:
+          parameters:
+          - name: test-results-gcs-dir
+            value: "{{inputs.parameters.test-results-gcs-dir}}"
+          - name: target-image-prefix
+            value: "{{inputs.parameters.target-image-prefix}}"
+          - name: dataflow-tft-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tft-image-suffix}}"
+          - name: dataflow-predict-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-predict-image-suffix}}"
+          - name: dataflow-tfma-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfma-image-suffix}}"
+          - name: dataflow-tfdv-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfdv-image-suffix}}"
+          - name: dataproc-create-cluster-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-create-cluster-image-suffix}}"
+          - name: dataproc-delete-cluster-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-delete-cluster-image-suffix}}"
+          - name: dataproc-analyze-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-analyze-image-suffix}}"
+          - name: dataproc-transform-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-transform-image-suffix}}"
+          - name: dataproc-train-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-train-image-suffix}}"
+          - name: dataproc-predict-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-predict-image-suffix}}"
+          - name: kubeflow-dnntrainer-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-dnntrainer-image-suffix}}"
+          - name: kubeflow-deployer-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-deployer-image-suffix}}"
+          - name: local-confusionmatrix-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-confusionmatrix-image-suffix}}"
+          - name: local-roc-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-roc-image-suffix}}"
+          - name: sample-tests-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
+          - name: namespace
+            value: "{{inputs.parameters.namespace}}"
+          - name: test-name
+            value: "tfx"
+      - name: run-xgboost-tests
+        template: run-sample-tests
+        arguments:
+          parameters:
+          - name: test-results-gcs-dir
+            value: "{{inputs.parameters.test-results-gcs-dir}}"
+          - name: target-image-prefix
+            value: "{{inputs.parameters.target-image-prefix}}"
+          - name: dataflow-tft-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tft-image-suffix}}"
+          - name: dataflow-predict-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-predict-image-suffix}}"
+          - name: dataflow-tfma-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfma-image-suffix}}"
+          - name: dataflow-tfdv-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfdv-image-suffix}}"
+          - name: dataproc-create-cluster-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-create-cluster-image-suffix}}"
+          - name: dataproc-delete-cluster-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-delete-cluster-image-suffix}}"
+          - name: dataproc-analyze-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-analyze-image-suffix}}"
+          - name: dataproc-transform-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-transform-image-suffix}}"
+          - name: dataproc-train-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-train-image-suffix}}"
+          - name: dataproc-predict-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-predict-image-suffix}}"
+          - name: kubeflow-dnntrainer-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-dnntrainer-image-suffix}}"
+          - name: kubeflow-deployer-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-deployer-image-suffix}}"
+          - name: local-confusionmatrix-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-confusionmatrix-image-suffix}}"
+          - name: local-roc-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-roc-image-suffix}}"
+          - name: sample-tests-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
+          - name: namespace
+            value: "{{inputs.parameters.namespace}}"
+          - name: test-name
+            value: "xgboost"
+      - name: run-notebook-tfx-tests
+        template: run-sample-tests
+        arguments:
+          parameters:
+          - name: test-results-gcs-dir
+            value: "{{inputs.parameters.test-results-gcs-dir}}"
+          - name: target-image-prefix
+            value: "{{inputs.parameters.target-image-prefix}}"
+          - name: dataflow-tft-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tft-image-suffix}}"
+          - name: dataflow-predict-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-predict-image-suffix}}"
+          - name: dataflow-tfma-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfma-image-suffix}}"
+          - name: dataflow-tfdv-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfdv-image-suffix}}"
+          - name: dataproc-create-cluster-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-create-cluster-image-suffix}}"
+          - name: dataproc-delete-cluster-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-delete-cluster-image-suffix}}"
+          - name: dataproc-analyze-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-analyze-image-suffix}}"
+          - name: dataproc-transform-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-transform-image-suffix}}"
+          - name: dataproc-train-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-train-image-suffix}}"
+          - name: dataproc-predict-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-predict-image-suffix}}"
+          - name: kubeflow-dnntrainer-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-dnntrainer-image-suffix}}"
+          - name: kubeflow-deployer-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-deployer-image-suffix}}"
+          - name: local-confusionmatrix-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-confusionmatrix-image-suffix}}"
+          - name: local-roc-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-roc-image-suffix}}"
+          - name: sample-tests-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
+          - name: namespace
+            value: "{{inputs.parameters.namespace}}"
+          - name: test-name
+            value: "notebook-tfx"
+      - name: run-notebook-lightweight-tests
+        template: run-sample-tests
+        arguments:
+          parameters:
+          - name: test-results-gcs-dir
+            value: "{{inputs.parameters.test-results-gcs-dir}}"
+          - name: target-image-prefix
+            value: "{{inputs.parameters.target-image-prefix}}"
+          - name: dataflow-tft-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tft-image-suffix}}"
+          - name: dataflow-predict-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-predict-image-suffix}}"
+          - name: dataflow-tfma-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfma-image-suffix}}"
+          - name: dataflow-tfdv-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfdv-image-suffix}}"
+          - name: dataproc-create-cluster-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-create-cluster-image-suffix}}"
+          - name: dataproc-delete-cluster-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-delete-cluster-image-suffix}}"
+          - name: dataproc-analyze-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-analyze-image-suffix}}"
+          - name: dataproc-transform-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-transform-image-suffix}}"
+          - name: dataproc-train-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-train-image-suffix}}"
+          - name: dataproc-predict-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-predict-image-suffix}}"
+          - name: kubeflow-dnntrainer-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-dnntrainer-image-suffix}}"
+          - name: kubeflow-deployer-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-deployer-image-suffix}}"
+          - name: local-confusionmatrix-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-confusionmatrix-image-suffix}}"
+          - name: local-roc-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-roc-image-suffix}}"
+          - name: sample-tests-image
+            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
+          - name: namespace
+            value: "{{inputs.parameters.namespace}}"
+          - name: test-name
+            value: "notebook-lightweight"
+
+
+  # Build and push image
+  - name: build-image-by-dockerfile
+    inputs:
+      parameters:
+      # GCS URI prefix pointing to a .tar.gz archive of Docker build context
+      - name: image-build-context-gcs-uri
+        value: "{{workflow.parameters.image-build-context-gcs-uri}}"
+      # The relative code path to the Dockerfile
+      - name: docker-path
+      # Name of the Docker file to use. "Dockerfile" by default
+      - name: docker-file
+        value: Dockerfile
+      - name: image-name
+    outputs:
+      parameters:
+        - name: strict-image-name
+          valueFrom:
+            path: /outputs/strict-image-name/file
+    container:
+      image: gcr.io/ml-pipeline-test/image-builder:v20181128-0.1.3-rc.1-109-ga5a14dc-e3b0c4
+      imagePullPolicy: 'Always'
+      args: [
+        "--image-build-context-gcs-uri", "{{inputs.parameters.image-build-context-gcs-uri}}",
+        "--docker_path", "{{inputs.parameters.docker-path}}",
+        "--docker_file", "{{inputs.parameters.docker-file}}",
+        "--image_name", "{{inputs.parameters.image-name}}",
+      ]
+      env:
+      - name: DOCKER_HOST
+        value: 127.0.0.1
+      - name: GOOGLE_APPLICATION_CREDENTIALS
+        value: /secret/gcp-credentials/user-gcp-sa.json
+      volumeMounts:
+      - name: gcp-credentials
+        mountPath: /secret/gcp-credentials
+    sidecars:
+    - name: dind
+      image: docker:17.10-dind
+      securityContext:
+        privileged: true
+      mirrorVolumeMounts: true
+
+  - name: build-image-by-script
+    inputs:
+      parameters:
+      # GCS URI prefix pointing to a .tar.gz archive of Docker build context
+      - name: image-build-context-gcs-uri
+        value: "{{workflow.parameters.image-build-context-gcs-uri}}"
+      # the path to the build script
+      - name: build-script
+      - name: image-name
+    outputs:
+      parameters:
+        - name: strict-image-name
+          valueFrom:
+            path: /outputs/strict-image-name/file
+    container:
+      image: gcr.io/ml-pipeline-test/image-builder:v20181128-0.1.3-rc.1-109-ga5a14dc-e3b0c4
+      imagePullPolicy: 'Always'
+      args: [
+        "--image-build-context-gcs-uri", "{{inputs.parameters.image-build-context-gcs-uri}}",
+        "--build_script", "{{inputs.parameters.build-script}}",
+        "--image_name", "{{inputs.parameters.image-name}}",
+      ]
+      env:
+      - name: DOCKER_HOST
+        value: 127.0.0.1
+      - name: GOOGLE_APPLICATION_CREDENTIALS
+        value: /secret/gcp-credentials/user-gcp-sa.json
+      volumeMounts:
+      - name: gcp-credentials
+        mountPath: /secret/gcp-credentials
+    sidecars:
+    - name: dind
+      image: docker:17.10-dind
+      securityContext:
+        privileged: true
+      mirrorVolumeMounts: true
+
+  - name: run-sample-tests
+    inputs:
+      parameters:
+      - name: test-results-gcs-dir
+      - name: target-image-prefix
+      - name: dataflow-tft-image
+      - name: dataflow-predict-image
+      - name: dataflow-tfma-image
+      - name: dataflow-tfdv-image
+      - name: dataproc-create-cluster-image
+      - name: dataproc-delete-cluster-image
+      - name: dataproc-analyze-image
+      - name: dataproc-transform-image
+      - name: dataproc-train-image
+      - name: dataproc-predict-image
+      - name: kubeflow-dnntrainer-image
+      - name: kubeflow-deployer-image
+      - name: local-confusionmatrix-image
+      - name: local-roc-image
+      - name: sample-tests-image
+      - name: namespace
+      - name: test-name
+    container:
+      image: "{{inputs.parameters.sample-tests-image}}"
+      args: [
+        "--results-gcs-dir", "{{inputs.parameters.test-results-gcs-dir}}",
+        "--target-image-prefix", "{{inputs.parameters.target-image-prefix}}",
+        "--dataflow-tft-image","{{inputs.parameters.dataflow-tft-image}}",
+        "--dataflow-predict-image","{{inputs.parameters.dataflow-predict-image}}",
+        "--dataflow-tfma-image","{{inputs.parameters.dataflow-tfma-image}}",
+        "--dataflow-tfdv-image","{{inputs.parameters.dataflow-tfdv-image}}",
+        "--dataproc-create-cluster-image","{{inputs.parameters.dataproc-create-cluster-image}}",
+        "--dataproc-delete-cluster-image","{{inputs.parameters.dataproc-delete-cluster-image}}",
+        "--dataproc-analyze-image","{{inputs.parameters.dataproc-analyze-image}}",
+        "--dataproc-transform-image","{{inputs.parameters.dataproc-transform-image}}",
+        "--dataproc-train-image","{{inputs.parameters.dataproc-train-image}}",
+        "--dataproc-predict-image","{{inputs.parameters.dataproc-predict-image}}",
+        "--kubeflow-dnntrainer-image","{{inputs.parameters.kubeflow-dnntrainer-image}}",
+        "--kubeflow-deployer-image","{{inputs.parameters.kubeflow-deployer-image}}",
+        "--local-confusionmatrix-image", "{{inputs.parameters.local-confusionmatrix-image}}",
+        "--local-roc-image", "{{inputs.parameters.local-roc-image}}",
+        "--namespace", "{{inputs.parameters.namespace}}",
+        "--test-name", "{{inputs.parameters.test-name}}",
+      ]
+      env:
+      - name: GOOGLE_APPLICATION_CREDENTIALS
+        value: /secret/gcp-credentials/user-gcp-sa.json
+      volumeMounts:
+      - name: gcp-credentials
+        mountPath: /secret/gcp-credentials
+

test/sample_test_v2.yaml

@@ -27,34 +27,6 @@ spec:
     - name: image-build-context-gcs-uri
     - name: target-image-prefix
     - name: test-results-gcs-dir
-    - name: dataflow-tft-image-suffix
-      value: dataflow-tft
-    - name: dataflow-predict-image-suffix
-      value: dataflow-predict
-    - name: dataflow-tfma-image-suffix
-      value: dataflow-tfma
-    - name: dataflow-tfdv-image-suffix
-      value: dataflow-tfdv
-    - name: dataproc-create-cluster-image-suffix
-      value: dataproc-create-cluster
-    - name: dataproc-delete-cluster-image-suffix
-      value: dataproc-delete-cluster
-    - name: dataproc-analyze-image-suffix
-      value: dataproc-analyze
-    - name: dataproc-transform-image-suffix
-      value: dataproc-transform
-    - name: dataproc-train-image-suffix
-      value: dataproc-train
-    - name: dataproc-predict-image-suffix
-      value: dataproc-predict
-    - name: kubeflow-dnntrainer-image-suffix
-      value: kubeflow-dnntrainer
-    - name: kubeflow-deployer-image-suffix
-      value: kubeflow-deployer
-    - name: local-confusionmatrix-image-suffix
-      value: local-confusionmatrix
-    - name: local-roc-image-suffix
-      value: local-roc
     - name: sample-tests-image-suffix
       value: sample-tests
     - name: namespace
@@ -65,20 +37,6 @@ spec:
       parameters:
       - name: target-image-prefix
       - name: test-results-gcs-dir
-      - name: dataflow-tft-image-suffix
-      - name: dataflow-predict-image-suffix
-      - name: dataflow-tfma-image-suffix
-      - name: dataflow-tfdv-image-suffix
-      - name: dataproc-create-cluster-image-suffix
-      - name: dataproc-delete-cluster-image-suffix
-      - name: dataproc-analyze-image-suffix
-      - name: dataproc-transform-image-suffix
-      - name: dataproc-train-image-suffix
-      - name: dataproc-predict-image-suffix
-      - name: kubeflow-dnntrainer-image-suffix
-      - name: kubeflow-deployer-image-suffix
-      - name: local-confusionmatrix-image-suffix
-      - name: local-roc-image-suffix
       - name: sample-tests-image-suffix
       - name: namespace
     steps:
@@ -92,118 +50,6 @@ spec:
             value: test/sample-test/Dockerfile
           - name: image-name
             value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
-      - name: build-dataflow-tft-image
-        template: build-image-by-script
-        arguments:
-          parameters:
-          - name: image-name
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tft-image-suffix}}"
-          - name: build-script
-            value: components/dataflow/tft/build_image.sh
-      - name: build-dataflow-predict-image
-        template: build-image-by-script
-        arguments:
-          parameters:
-          - name: image-name
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-predict-image-suffix}}"
-          - name: build-script
-            value: components/dataflow/predict/build_image.sh
-      - name: build-dataflow-tfma-image
-        template: build-image-by-script
-        arguments:
-          parameters:
-          - name: image-name
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfma-image-suffix}}"
-          - name: build-script
-            value: components/dataflow/tfma/build_image.sh
-      - name: build-dataflow-tfdv-image
-        template: build-image-by-script
-        arguments:
-          parameters:
-          - name: image-name
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfdv-image-suffix}}"
-          - name: build-script
-            value: components/dataflow/tfdv/build_image.sh
-      - name: build-dataproc-create-cluster-image
-        template: build-image-by-script
-        arguments:
-          parameters:
-          - name: image-name
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-create-cluster-image-suffix}}"
-          - name: build-script
-            value: components/dataproc/create_cluster/build_image.sh
-      - name: build-dataproc-delete-cluster-image
-        template: build-image-by-script
-        arguments:
-          parameters:
-          - name: image-name
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-delete-cluster-image-suffix}}"
-          - name: build-script
-            value: components/dataproc/delete_cluster/build_image.sh
-      - name: build-dataproc-analyze-image
-        template: build-image-by-script
-        arguments:
-          parameters:
-          - name: image-name
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-analyze-image-suffix}}"
-          - name: build-script
-            value: components/dataproc/analyze/build_image.sh
-      - name: build-dataproc-transform-image
-        template: build-image-by-script
-        arguments:
-          parameters:
-          - name: image-name
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-transform-image-suffix}}"
-          - name: build-script
-            value: components/dataproc/transform/build_image.sh
-      - name: build-dataproc-train-image
-        template: build-image-by-script
-        arguments:
-          parameters:
-          - name: image-name
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-train-image-suffix}}"
-          - name: build-script
-            value: components/dataproc/train/build_image.sh
-      - name: build-dataproc-predict-image
-        template: build-image-by-script
-        arguments:
-          parameters:
-          - name: image-name
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-predict-image-suffix}}"
-          - name: build-script
-            value: components/dataproc/predict/build_image.sh
-      - name: build-kubeflow-dnntrainer-image
-        template: build-image-by-script
-        arguments:
-          parameters:
-          - name: image-name
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-dnntrainer-image-suffix}}"
-          - name: build-script
-            value: components/kubeflow/dnntrainer/build_image.sh
-      - name: build-kubeflow-deployer-image
-        template: build-image-by-dockerfile
-        arguments:
-          parameters:
-          - name: docker-path
-            value: components/kubeflow/deployer
-          - name: image-name
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-deployer-image-suffix}}"
-      - name: build-local-confusion-matrix
-        template: build-image-by-script
-        arguments:
-          parameters:
-          - name: image-name
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-confusionmatrix-image-suffix}}"
-          - name: build-script
-            value: components/local/confusion_matrix/build_image.sh
-      - name: build-local-roc
-        template: build-image-by-script
-        arguments:
-          parameters:
-          - name: image-name
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-roc-image-suffix}}"
-          - name: build-script
-            value: components/local/roc/build_image.sh
     - - name: run-tf-training-tests
         template: run-sample-tests
         arguments:
@@ -212,34 +58,6 @@ spec:
             value: "{{inputs.parameters.test-results-gcs-dir}}"
           - name: target-image-prefix
             value: "{{inputs.parameters.target-image-prefix}}"
-          - name: dataflow-tft-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tft-image-suffix}}"
-          - name: dataflow-predict-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-predict-image-suffix}}"
-          - name: dataflow-tfma-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfma-image-suffix}}"
-          - name: dataflow-tfdv-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfdv-image-suffix}}"
-          - name: dataproc-create-cluster-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-create-cluster-image-suffix}}"
-          - name: dataproc-delete-cluster-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-delete-cluster-image-suffix}}"
-          - name: dataproc-analyze-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-analyze-image-suffix}}"
-          - name: dataproc-transform-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-transform-image-suffix}}"
-          - name: dataproc-train-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-train-image-suffix}}"
-          - name: dataproc-predict-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-predict-image-suffix}}"
-          - name: kubeflow-dnntrainer-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-dnntrainer-image-suffix}}"
-          - name: kubeflow-deployer-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-deployer-image-suffix}}"
-          - name: local-confusionmatrix-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-confusionmatrix-image-suffix}}"
-          - name: local-roc-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-roc-image-suffix}}"
           - name: sample-tests-image
             value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
           - name: namespace
@@ -254,34 +72,6 @@ spec:
             value: "{{inputs.parameters.test-results-gcs-dir}}"
           - name: target-image-prefix
             value: "{{inputs.parameters.target-image-prefix}}"
-          - name: dataflow-tft-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tft-image-suffix}}"
-          - name: dataflow-predict-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-predict-image-suffix}}"
-          - name: dataflow-tfma-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfma-image-suffix}}"
-          - name: dataflow-tfdv-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfdv-image-suffix}}"
-          - name: dataproc-create-cluster-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-create-cluster-image-suffix}}"
-          - name: dataproc-delete-cluster-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-delete-cluster-image-suffix}}"
-          - name: dataproc-analyze-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-analyze-image-suffix}}"
-          - name: dataproc-transform-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-transform-image-suffix}}"
-          - name: dataproc-train-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-train-image-suffix}}"
-          - name: dataproc-predict-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-predict-image-suffix}}"
-          - name: kubeflow-dnntrainer-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-dnntrainer-image-suffix}}"
-          - name: kubeflow-deployer-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-deployer-image-suffix}}"
-          - name: local-confusionmatrix-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-confusionmatrix-image-suffix}}"
-          - name: local-roc-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-roc-image-suffix}}"
           - name: sample-tests-image
             value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
           - name: namespace
@@ -296,34 +86,6 @@ spec:
             value: "{{inputs.parameters.test-results-gcs-dir}}"
           - name: target-image-prefix
             value: "{{inputs.parameters.target-image-prefix}}"
-          - name: dataflow-tft-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tft-image-suffix}}"
-          - name: dataflow-predict-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-predict-image-suffix}}"
-          - name: dataflow-tfma-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfma-image-suffix}}"
-          - name: dataflow-tfdv-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfdv-image-suffix}}"
-          - name: dataproc-create-cluster-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-create-cluster-image-suffix}}"
-          - name: dataproc-delete-cluster-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-delete-cluster-image-suffix}}"
-          - name: dataproc-analyze-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-analyze-image-suffix}}"
-          - name: dataproc-transform-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-transform-image-suffix}}"
-          - name: dataproc-train-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-train-image-suffix}}"
-          - name: dataproc-predict-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-predict-image-suffix}}"
-          - name: kubeflow-dnntrainer-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-dnntrainer-image-suffix}}"
-          - name: kubeflow-deployer-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-deployer-image-suffix}}"
-          - name: local-confusionmatrix-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-confusionmatrix-image-suffix}}"
-          - name: local-roc-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-roc-image-suffix}}"
           - name: sample-tests-image
             value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
           - name: namespace
@@ -338,34 +100,6 @@ spec:
             value: "{{inputs.parameters.test-results-gcs-dir}}"
           - name: target-image-prefix
             value: "{{inputs.parameters.target-image-prefix}}"
-          - name: dataflow-tft-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tft-image-suffix}}"
-          - name: dataflow-predict-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-predict-image-suffix}}"
-          - name: dataflow-tfma-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfma-image-suffix}}"
-          - name: dataflow-tfdv-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfdv-image-suffix}}"
-          - name: dataproc-create-cluster-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-create-cluster-image-suffix}}"
-          - name: dataproc-delete-cluster-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-delete-cluster-image-suffix}}"
-          - name: dataproc-analyze-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-analyze-image-suffix}}"
-          - name: dataproc-transform-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-transform-image-suffix}}"
-          - name: dataproc-train-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-train-image-suffix}}"
-          - name: dataproc-predict-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-predict-image-suffix}}"
-          - name: kubeflow-dnntrainer-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-dnntrainer-image-suffix}}"
-          - name: kubeflow-deployer-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-deployer-image-suffix}}"
-          - name: local-confusionmatrix-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-confusionmatrix-image-suffix}}"
-          - name: local-roc-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-roc-image-suffix}}"
           - name: sample-tests-image
             value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
           - name: namespace
@@ -380,34 +114,6 @@ spec:
             value: "{{inputs.parameters.test-results-gcs-dir}}"
           - name: target-image-prefix
             value: "{{inputs.parameters.target-image-prefix}}"
-          - name: dataflow-tft-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tft-image-suffix}}"
-          - name: dataflow-predict-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-predict-image-suffix}}"
-          - name: dataflow-tfma-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfma-image-suffix}}"
-          - name: dataflow-tfdv-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataflow-tfdv-image-suffix}}"
-          - name: dataproc-create-cluster-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-create-cluster-image-suffix}}"
-          - name: dataproc-delete-cluster-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-delete-cluster-image-suffix}}"
-          - name: dataproc-analyze-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-analyze-image-suffix}}"
-          - name: dataproc-transform-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-transform-image-suffix}}"
-          - name: dataproc-train-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-train-image-suffix}}"
-          - name: dataproc-predict-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.dataproc-predict-image-suffix}}"
-          - name: kubeflow-dnntrainer-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-dnntrainer-image-suffix}}"
-          - name: kubeflow-deployer-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.kubeflow-deployer-image-suffix}}"
-          - name: local-confusionmatrix-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-confusionmatrix-image-suffix}}"
-          - name: local-roc-image
-            value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.local-roc-image-suffix}}"
           - name: sample-tests-image
             value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
           - name: namespace
@@ -458,62 +164,11 @@ spec:
         privileged: true
       mirrorVolumeMounts: true
 
-  - name: build-image-by-script
-    inputs:
-      parameters:
-      # GCS URI prefix pointing to a .tar.gz archive of Docker build context
-      - name: image-build-context-gcs-uri
-        value: "{{workflow.parameters.image-build-context-gcs-uri}}"
-      # the path to the build script
-      - name: build-script
-      - name: image-name
-    outputs:
-      parameters:
-        - name: strict-image-name
-          valueFrom:
-            path: /outputs/strict-image-name/file
-    container:
-      image: gcr.io/ml-pipeline-test/image-builder:v20181128-0.1.3-rc.1-109-ga5a14dc-e3b0c4
-      imagePullPolicy: 'Always'
-      args: [
-        "--image-build-context-gcs-uri", "{{inputs.parameters.image-build-context-gcs-uri}}",
-        "--build_script", "{{inputs.parameters.build-script}}",
-        "--image_name", "{{inputs.parameters.image-name}}",
-      ]
-      env:
-      - name: DOCKER_HOST
-        value: 127.0.0.1
-      - name: GOOGLE_APPLICATION_CREDENTIALS
-        value: /secret/gcp-credentials/user-gcp-sa.json
-      volumeMounts:
-      - name: gcp-credentials
-        mountPath: /secret/gcp-credentials
-    sidecars:
-    - name: dind
-      image: docker:17.10-dind
-      securityContext:
-        privileged: true
-      mirrorVolumeMounts: true
-
   - name: run-sample-tests
     inputs:
       parameters:
       - name: test-results-gcs-dir
       - name: target-image-prefix
-      - name: dataflow-tft-image
-      - name: dataflow-predict-image
-      - name: dataflow-tfma-image
-      - name: dataflow-tfdv-image
-      - name: dataproc-create-cluster-image
-      - name: dataproc-delete-cluster-image
-      - name: dataproc-analyze-image
-      - name: dataproc-transform-image
-      - name: dataproc-train-image
-      - name: dataproc-predict-image
-      - name: kubeflow-dnntrainer-image
-      - name: kubeflow-deployer-image
-      - name: local-confusionmatrix-image
-      - name: local-roc-image
       - name: sample-tests-image
       - name: namespace
       - name: test-name
@@ -522,20 +177,6 @@ spec:
       args: [
         "--results-gcs-dir", "{{inputs.parameters.test-results-gcs-dir}}",
         "--target-image-prefix", "{{inputs.parameters.target-image-prefix}}",
-        "--dataflow-tft-image","{{inputs.parameters.dataflow-tft-image}}",
-        "--dataflow-predict-image","{{inputs.parameters.dataflow-predict-image}}",
-        "--dataflow-tfma-image","{{inputs.parameters.dataflow-tfma-image}}",
-        "--dataflow-tfdv-image","{{inputs.parameters.dataflow-tfdv-image}}",
-        "--dataproc-create-cluster-image","{{inputs.parameters.dataproc-create-cluster-image}}",
-        "--dataproc-delete-cluster-image","{{inputs.parameters.dataproc-delete-cluster-image}}",
-        "--dataproc-analyze-image","{{inputs.parameters.dataproc-analyze-image}}",
-        "--dataproc-transform-image","{{inputs.parameters.dataproc-transform-image}}",
-        "--dataproc-train-image","{{inputs.parameters.dataproc-train-image}}",
-        "--dataproc-predict-image","{{inputs.parameters.dataproc-predict-image}}",
-        "--kubeflow-dnntrainer-image","{{inputs.parameters.kubeflow-dnntrainer-image}}",
-        "--kubeflow-deployer-image","{{inputs.parameters.kubeflow-deployer-image}}",
-        "--local-confusionmatrix-image", "{{inputs.parameters.local-confusionmatrix-image}}",
-        "--local-roc-image", "{{inputs.parameters.local-roc-image}}",
         "--namespace", "{{inputs.parameters.namespace}}",
         "--test-name", "{{inputs.parameters.test-name}}",
       ]