Kubeflow autodeploy jobs need to use kubeflow/kfctl

* Related to kubeflow/kfctl#7
jlewi · Nov 8, 2019 · 4263e83 · 4263e83
1 parent 21d7bc8
commit 4263e83
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/py/kubeflow/testing/create_unique_kf_instance.py b/py/kubeflow/testing/create_unique_kf_instance.py
@@ -31,7 +31,7 @@ def run_with_retry(*args, **kwargs):
 
 def build_kfctl_go(args):
   """Build kfctl go."""
-  build_dir = os.path.join(args.kubeflow_repo, "bootstrap")
+  build_dir = os.path.join(args.kubeflow_repo)
   # We need to use retry builds because when building in the test cluster
   # we see intermittent failures pulling dependencies
   util.run(["make", "build-kfctl"], cwd=build_dir)

diff --git a/test-infra/auto-deploy/deploy-cron-master.yaml b/test-infra/auto-deploy/deploy-cron-master.yaml
@@ -15,8 +15,7 @@ spec:
           initContainers:
           - command:        
             - /usr/local/bin/checkout_repos.sh 
-            # Stop using PR #495 once its subbmitted
-            - --repos=kubeflow/kubeflow@HEAD,kubeflow/testing@HEAD
+            - --repos=kubeflow/kfctl@HEAD,kubeflow/testing@HEAD
             - --src_dir=/src
             env:
             - name: PYTHONPATH
@@ -48,7 +47,7 @@ spec:
             - -m
             - kubeflow.testing.create_unique_kf_instance
             - --apps_dir=/src/apps
-            - --kubeflow_repo=/src/kubeflow/kubeflow
+            - --kubeflow_repo=/src/kubeflow/kfctl
             - --name=kf-vmaster-{uid}
             - --project=kubeflow-ci-deployment
             - --zone=us-central1-a

diff --git a/test-infra/auto-deploy/deploy-master.yaml b/test-infra/auto-deploy/deploy-master.yaml
@@ -20,8 +20,8 @@ spec:
       initContainers:
       - command:        
         - /usr/local/bin/checkout_repos.sh 
-        # Stop using PR #495 once its subbmitted
-        - --repos=kubeflow/kubeflow@HEAD,kubeflow/testing@HEAD:506
+        # Stop using PR #495 once its subbmitted        
+        - --repos=kubeflow/kfctl@HEAD,kubeflow/testing@HEAD:506
         - --src_dir=/src
         env:
         - name: PYTHONPATH
@@ -53,7 +53,7 @@ spec:
         - -m
         - kubeflow.testing.create_unique_kf_instance
         - --apps_dir=/src/apps
-        - --kubeflow_repo=/src/kubeflow/kubeflow
+        - --kubeflow_repo=/src/kubeflow/kfctl
         - --name=kf-vmaster-{uid}
         - --project=kubeflow-ci-deployment
         - --zone=us-central1-a