Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/kfp-samples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
id: tests
env:
PULL_NUMBER: ${{ github.event.pull_request.number }}
REPO_NAME: ${{ github.repository }}
run: |
./backend/src/v2/test/sample-test.sh
continue-on-error: true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/kfp-sdk-runtime-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ jobs:
- name: Run KFP Runtime Code Tests
run: |
export PULL_NUMBER="${{ github.event.inputs.pull_number || github.event.pull_request.number }}"
export REPO_NAME="${{ github.repository }}"
./test/presubmit-test-kfp-runtime-code.sh
3 changes: 3 additions & 0 deletions .github/workflows/sdk-execution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ jobs:

- name: Run tests
id: tests
env:
PULL_NUMBER: ${{ github.event.pull_request.number }}
REPO_NAME: ${{ github.repository }}
run: |
export KFP_ENDPOINT="http://localhost:8888"
export TIMEOUT_SECONDS=2700
Expand Down
6 changes: 4 additions & 2 deletions backend/src/v2/test/sample-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ python3 -m pip install -r ./requirements-sample-test.txt

popd

REPO_NAME="${REPO_NAME:-kubeflow/pipelines}"

if [[ -n "${PULL_NUMBER}" ]]; then
export KFP_PACKAGE_PATH="git+https://github.com/kubeflow/pipelines@refs/pull/${PULL_NUMBER}/merge#egg=kfp&subdirectory=sdk/python"
export KFP_PACKAGE_PATH="git+https://github.com/${REPO_NAME}@refs/pull/${PULL_NUMBER}/merge#egg=kfp&subdirectory=sdk/python"
else
export KFP_PACKAGE_PATH='git+https://github.com/kubeflow/pipelines#egg=kfp&subdirectory=sdk/python'
export KFP_PACKAGE_PATH="git+https://github.com/${REPO_NAME}#egg=kfp&subdirectory=sdk/python"
fi

python3 -m pip install $KFP_PACKAGE_PATH
Expand Down
5 changes: 3 additions & 2 deletions backend/src/v2/test/scripts/ci-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ GCS_ROOT="gs://${PROJECT}/${COMMIT_SHA}/v2-sample-test"
GCR_ROOT="gcr.io/${PROJECT}/${COMMIT_SHA}/v2-sample-test"
# This is kfp-ci endpoint.
HOST=${HOST:-"https://$(curl https://raw.githubusercontent.com/kubeflow/testing/master/test-infra/kfp/endpoint)"}
REPO_NAME="${REPO_NAME:-kubeflow/pipelines}"

if [[ -z "${PULL_NUMBER}" ]]; then
KFP_PACKAGE_PATH='git+https://github.com/kubeflow/pipelines\#egg=kfp&subdirectory=sdk/python'
KFP_PACKAGE_PATH="git+https://github.com/${REPO_NAME}#egg=kfp&subdirectory=sdk/python"
else
KFP_PACKAGE_PATH='git+https://github.com/kubeflow/pipelines@refs/pull/${PULL_NUMBER}/merge\#egg=kfp&subdirectory=sdk/python'
KFP_PACKAGE_PATH="git+https://github.com/${REPO_NAME}@refs/pull/${PULL_NUMBER}/merge#egg=kfp&subdirectory=sdk/python"
fi

cat <<EOF >kfp-ci.env
Expand Down
5 changes: 3 additions & 2 deletions test/kfp-kubernetes-execution-tests/sdk_execution_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,11 @@ def run(test_case: TestCase) -> Tuple[str, client.client.RunPipelineResult]:


def get_kfp_package_path() -> str:
repo_name = os.environ.get('REPO_NAME', 'kubeflow/pipelines')
if os.environ.get('PULL_NUMBER') is not None:
path = f'git+https://github.com/kubeflow/pipelines.git@refs/pull/{os.environ.get("PULL_NUMBER")}/merge#subdirectory=sdk/python'
path = f'git+https://github.com/{repo_name}.git@refs/pull/{os.environ["PULL_NUMBER"]}/merge#subdirectory=sdk/python'
else:
path = 'git+https://github.com/kubeflow/pipelines.git@master#subdirectory=sdk/python'
path = 'git+https://github.com/{repo_name}.git@master#subdirectory=sdk/python'
print(f'Using the following KFP package path for tests: {path}')
return path

Expand Down
3 changes: 2 additions & 1 deletion test/presubmit-tests-sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ pytest sdk/python/kfp --cov=kfp
set +x
# export COVERALLS_REPO_TOKEN=$(gsutil cat gs://ml-pipeline-test-keys/coveralls_repo_token)
set -x
REPO_BASE="https://github.com/kubeflow/pipelines"
REPO_NAME="${REPO_NAME:-kubeflow/pipelines}"
REPO_BASE="https://github.com/${REPO_NAME}"
export COVERALLS_SERVICE_NAME="prow"
export COVERALLS_SERVICE_JOB_ID=$PROW_JOB_ID
export CI_PULL_REQUEST="$REPO_BASE/pull/$PULL_NUMBER"
Expand Down
5 changes: 3 additions & 2 deletions test/sdk-execution-tests/sdk_execution_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,11 @@ def run(test_case: TestCase) -> Tuple[str, client.client.RunPipelineResult]:


def get_kfp_package_path() -> str:
repo_name = os.environ.get('REPO_NAME', 'kubeflow/pipelines')
if os.environ.get('PULL_NUMBER') is not None:
path = f'git+https://github.com/kubeflow/pipelines.git@refs/pull/{os.environ.get("PULL_NUMBER")}/merge#subdirectory=sdk/python'
path = f'git+https://github.com/{repo_name}.git@refs/pull/{os.environ["PULL_NUMBER"]}/merge#subdirectory=sdk/python'
else:
path = 'git+https://github.com/kubeflow/pipelines.git@master#subdirectory=sdk/python'
path = 'git+https://github.com/{repo_name}.git@master#subdirectory=sdk/python'
print(f'Using the following KFP package path for tests: {path}')
return path

Expand Down