From 068335cc734ae6c192f962bac5221e49348a5fd1 Mon Sep 17 00:00:00 2001 From: Diego Lovison Date: Mon, 15 Jul 2024 16:25:17 -0300 Subject: [PATCH 1/3] test: Add script and GitHub Action for kfp-kubernetes-library Signed-off-by: Diego Lovison --- .github/workflows/kfp-kubernetes-test.yaml | 37 +++++++++++++++++++ test/presubmit-test-kfp-kubernetes-library.sh | 15 ++++++-- 2 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/kfp-kubernetes-test.yaml diff --git a/.github/workflows/kfp-kubernetes-test.yaml b/.github/workflows/kfp-kubernetes-test.yaml new file mode 100644 index 00000000000..f2bab6b71c0 --- /dev/null +++ b/.github/workflows/kfp-kubernetes-test.yaml @@ -0,0 +1,37 @@ +name: KFP K8s Platform Tests + +on: + push: + branches: [master] + pull_request: + paths: + - '.github/workflows/kfp-kubernetes-library.yaml' + - 'sdk/python/**' + - 'api/v2alpha1/**' + - 'kubernetes_platform/**' + - 'test/presubmit-test-kfp-kubernetes-library.sh' + +jobs: + kfp-kubernetes-library-test: + runs-on: ubuntu-24.04 + strategy: + matrix: + python: [ + { 'version': '3.8' }, + { 'version': '3.9' }, + { 'version': '3.10' }, + { 'version': '3.11' }, + { 'version': '3.12' } + ] + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: ${{matrix.python.version}} + + - name: Run tests + # original file is using sudo + run: ./test/presubmit-test-kfp-kubernetes-library.sh diff --git a/test/presubmit-test-kfp-kubernetes-library.sh b/test/presubmit-test-kfp-kubernetes-library.sh index 30a688872ef..2b9c19a1d7e 100755 --- a/test/presubmit-test-kfp-kubernetes-library.sh +++ b/test/presubmit-test-kfp-kubernetes-library.sh @@ -15,11 +15,20 @@ source_root=$(pwd) +if [ $(id -u) = 0 ]; then + apt-get update && apt-get install -y protobuf-compiler + # rust needed for transitive deps in dev extras on Python:3.12 + apt-get install rustc -y +else + sudo apt-get update && sudo apt-get install -y protobuf-compiler + # rust needed for transitive deps in dev extras on Python:3.12 + sudo apt-get install rustc -y +fi + pip install --upgrade pip pip install wheel - pip install sdk/python -apt-get update && apt-get install -y protobuf-compiler + pushd api make clean python popd @@ -31,7 +40,5 @@ pushd "$source_root/kubernetes_platform" make clean python popd -# rust needed for transitive deps in dev extras on Python:3.12 -apt-get install rustc -y pip install -e "$source_root/kubernetes_platform/python[dev]" pytest "$source_root/kubernetes_platform/python/test" -n auto From c65d9114e3cd601744232ce27cb0c1b42e2a5123 Mon Sep 17 00:00:00 2001 From: Diego Lovison Date: Tue, 16 Jul 2024 08:11:25 -0300 Subject: [PATCH 2/3] Rename Signed-off-by: Diego Lovison --- ...kubernetes-test.yaml => kfp-kubernetes-library-test.yaml} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename .github/workflows/{kfp-kubernetes-test.yaml => kfp-kubernetes-library-test.yaml} (86%) diff --git a/.github/workflows/kfp-kubernetes-test.yaml b/.github/workflows/kfp-kubernetes-library-test.yaml similarity index 86% rename from .github/workflows/kfp-kubernetes-test.yaml rename to .github/workflows/kfp-kubernetes-library-test.yaml index f2bab6b71c0..4249d2e5736 100644 --- a/.github/workflows/kfp-kubernetes-test.yaml +++ b/.github/workflows/kfp-kubernetes-library-test.yaml @@ -1,11 +1,11 @@ -name: KFP K8s Platform Tests +name: kfp-kubernetes library tests on: push: branches: [master] pull_request: paths: - - '.github/workflows/kfp-kubernetes-library.yaml' + - '.github/workflows/kfp-kubernetes-library-test.yaml' - 'sdk/python/**' - 'api/v2alpha1/**' - 'kubernetes_platform/**' @@ -33,5 +33,4 @@ jobs: python-version: ${{matrix.python.version}} - name: Run tests - # original file is using sudo run: ./test/presubmit-test-kfp-kubernetes-library.sh From 8018f4c34da7130b202730e8d8bd7538a868191f Mon Sep 17 00:00:00 2001 From: Diego Lovison Date: Tue, 16 Jul 2024 09:28:56 -0300 Subject: [PATCH 3/3] Update bash to have sudo Signed-off-by: Diego Lovison --- test/presubmit-test-kfp-kubernetes-library.sh | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/test/presubmit-test-kfp-kubernetes-library.sh b/test/presubmit-test-kfp-kubernetes-library.sh index 2b9c19a1d7e..160bbf7e82a 100755 --- a/test/presubmit-test-kfp-kubernetes-library.sh +++ b/test/presubmit-test-kfp-kubernetes-library.sh @@ -1,5 +1,5 @@ #!/bin/bash -ex -# Copyright 2023 Kubeflow Pipelines contributors +# Copyright 2024 Kubeflow Pipelines contributors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,20 +15,11 @@ source_root=$(pwd) -if [ $(id -u) = 0 ]; then - apt-get update && apt-get install -y protobuf-compiler - # rust needed for transitive deps in dev extras on Python:3.12 - apt-get install rustc -y -else - sudo apt-get update && sudo apt-get install -y protobuf-compiler - # rust needed for transitive deps in dev extras on Python:3.12 - sudo apt-get install rustc -y -fi - pip install --upgrade pip pip install wheel -pip install sdk/python +pip install sdk/python +sudo apt-get update && sudo apt-get install -y protobuf-compiler pushd api make clean python popd @@ -40,5 +31,7 @@ pushd "$source_root/kubernetes_platform" make clean python popd +# rust needed for transitive deps in dev extras on Python:3.12 +sudo apt-get install rustc -y pip install -e "$source_root/kubernetes_platform/python[dev]" pytest "$source_root/kubernetes_platform/python/test" -n auto