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.

Sign up for GitHub

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 KFCTL e2e test build path #4493

Merged
merged 3 commits into from
Nov 8, 2019
Merged

Fix KFCTL e2e test build path #4493

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2313966
update testing folders in e2e
gabrielwen Nov 8, 2019
9757bd1
add parameter to kfctl repo
gabrielwen Nov 8, 2019
1fec3b9
build from kfctl_repo_path
gabrielwen Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
update testing folders in e2e
  • Loading branch information
@gabrielwen
gabrielwen committed Nov 8, 2019
commit 231396646e24a7b6e09b8eb91e7a89ea80bd032e
17 changes: 9 additions & 8 deletions py/kubeflow/kubeflow/ci/kfctl_e2e_workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,15 @@ def __init__(self, name=None, namespace=None,

# source directory where all repos should be checked out
self.src_root_dir = self.test_dir + "/src"
# The directory containing the kubeflow/kubeflow repo
self.src_dir = self.src_root_dir + "/kubeflow/kubeflow"
# The directory containing the kubeflow/kfctl repo
self.src_dir = self.src_root_dir + "/kubeflow/kfctl"
self.kubeflow_dir = self.src_root_dir + "/kubeflow/kubeflow"

# Directory in kubeflow/kubeflow containing the pytest files for kfctl
self.kfctl_pytest_dir = os.path.join(self.src_dir, "testing/kfctl")
# Directory in kubeflow/kfctl containing the pytest files.
self.kfctl_pytest_dir = os.path.join(self.src_dir, "testing/e2e")

# Top level directories for python code
self.kubeflow_py = self.src_dir
self.kubeflow_py = self.kubeflow_dir

# The directory within the kubeflow_testing submodule containing
# py scripts to use.
Expand Down Expand Up @@ -196,7 +197,7 @@ def __init__(self, name=None, namespace=None,
self.steps_namespace = "kubeflow"
self.test_endpoint = test_endpoint

self.kfctl_path = os.path.join(self.src_dir, "bootstrap/bin/kfctl")
self.kfctl_path = os.path.join(self.src_dir, "bin/kfctl")

# Fetch the main repo from Prow environment.
self.main_repo = argo_build_util.get_repo_from_prow_env()
Expand Down Expand Up @@ -399,7 +400,7 @@ def _build_tests_dag(self):
command, dependences)

notebook_test["container"]["workingDir"] = os.path.join(
self.src_dir, "kubeflow/jupyter/tests")
self.kubeflow_dir, "kubeflow/jupyter/tests")

#***************************************************************************
# Profiles test
Expand All @@ -420,7 +421,7 @@ def _build_tests_dag(self):
command, dependences)

profiles_test["container"]["workingDir"] = os.path.join(
self.src_dir, "kubeflow/profiles/tests")
self.kubeflow_dir, "kubeflow/profiles/tests")

def _build_exit_dag(self):
"""Build the exit handler dag"""
Expand Down