Skip to content

Commit

Permalink
fix path
Browse files Browse the repository at this point in the history
  • Loading branch information
chensun committed Jan 25, 2022
1 parent c491650 commit 78ce469
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions backend/src/v2/test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
FROM python:3.7-slim

WORKDIR /workdir
COPY v2/test/requirements.txt v2/test/
COPY v2/test/requirements-runner.txt v2/test/
COPY backend/src/v2/test/requirements.txt backend/src/v2/test/
COPY backend/src/v2/test/requirements-runner.txt backend/src/v2/test/
COPY sdk/python sdk/python
COPY samples/test/utils samples/test/utils
# relative path in requirements.txt are relative to workdir, so we need to
# cd to that folder first
RUN cd v2/test && pip3 install --no-cache-dir -r requirements-runner.txt
RUN cd backend/src/v2/test && pip3 install --no-cache-dir -r requirements-runner.txt
# copy all other code
COPY . .
4 changes: 2 additions & 2 deletions backend/src/v2/test/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
REPO_ROOT=../..
REPO_ROOT=../../../..

# These vars are expected in .env:
# GCS_ROOT=gs://$(PROJECT)/v2-sample-test
Expand Down Expand Up @@ -58,7 +58,7 @@ context:
# as expected.
cd $(REPO_ROOT); \
stash=$$(git stash create); \
git archive --format=tar "$${stash:-HEAD}" | gzip >v2/test/tmp/context.tar.gz
git archive --format=tar "$${stash:-HEAD}" | gzip >backend/src/v2/test/tmp/context.tar.gz

.PHONY: mlmd-port-forward
mlmd-port-forward:
Expand Down
2 changes: 1 addition & 1 deletion backend/src/v2/test/components/build_go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ implementation:
digest_driver_output_path="$3"
backend_compiler_output_path="$4"
cd "${context_path}/v2"
cd "${context_path}/backend/src/v2"
# install dependencies
apk update
Expand Down
4 changes: 2 additions & 2 deletions backend/src/v2/test/sample_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def build_image(name: str, dockerfile: str) -> kfp.dsl.ContainerOp:
# build sample test image
build_samples_image_op = build_image(
name='v2-sample-test',
dockerfile='v2/test/Dockerfile',
dockerfile='backend/src/v2/test/Dockerfile',
)

# run test samples in parallel
Expand Down Expand Up @@ -112,7 +112,7 @@ def main(
str = 'git+https://github.com/kubeflow/pipelines#egg=kfp&subdirectory=sdk/python',
samples_config: str = os.path.join('samples', 'test', 'config.yaml'),
):
REPO_ROOT = os.path.join('..', '..')
REPO_ROOT = os.path.join('..', '..', '..', '..')
samples_config_path = os.path.join(REPO_ROOT, samples_config)
samples_config_content = None
with open(samples_config_path, 'r') as stream:
Expand Down

0 comments on commit 78ce469

Please sign in to comment.