Skip to content

Commit 5493bf8

Browse files
Googlerchahatsagarmain
authored andcommitted
chore(components): Bump image version for Structured Data pipelines
Signed-off-by: Googler <[email protected]> PiperOrigin-RevId: 723803948 make commands Signed-off-by: chahatsagarmain <[email protected]>
1 parent 6cb7cf7 commit 5493bf8

File tree

65 files changed

+867
-697
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+867
-697
lines changed

.github/actions/kfp-cluster/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ runs:
1919

2020
- name: Build images
2121
shell: bash
22-
run: ./.github/resources/scripts/build-images.sh
22+
run: make build-images
2323

2424
- name: Deploy KFP
2525
shell: bash
26-
run: ./.github/resources/scripts/deploy-kfp.sh
26+
run: make deploy-kfp

.github/actions/kfp-tekton-cluster/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ runs:
1414

1515
- name: Build images
1616
shell: bash
17-
run: ./.github/resources/scripts/build-images.sh
17+
run: make build-images
1818

1919
- name: Deploy KFP
2020
shell: bash
21-
run: ./.github/resources/scripts/deploy-kfp-tekton.sh
21+
run: make deploy-kfp-tekton

.github/workflows/backend-visualization.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ jobs:
2323
python-version: '3.9'
2424

2525
- name: Run tests
26-
run: ./test/presubmit-backend-visualization.sh
26+
run: make test-backend-visualization-test

.github/workflows/backend.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,31 +40,24 @@ jobs:
4040
python-version: '3.9'
4141
- name: Install sdk
4242
run: |
43-
python3 -m venv .venv
44-
. .venv/bin/activate
45-
pip install -e sdk/python
43+
make setup-backend-test
4644
- name: Create KFP cluster
4745
uses: ./.github/actions/kfp-tekton-cluster
4846
- name: "flip coin test"
4947
run: |
50-
. .venv/bin/activate
51-
TEST_SCRIPT="test-flip-coin.sh" ./.github/resources/scripts/e2e-test.sh
48+
make test-backend-test-flip-coin
5249
- name: "static loop test"
5350
run: |
54-
. .venv/bin/activate
55-
TEST_SCRIPT="test-static-loop.sh" ./.github/resources/scripts/e2e-test.sh
51+
make test-backend-test-static-loop
5652
- name: "dynamic loop test"
5753
run: |
58-
. .venv/bin/activate
59-
TEST_SCRIPT="test-dynamic-loop.sh" ./.github/resources/scripts/e2e-test.sh
54+
make test-backend-test-dynamic-loop
6055
- name: "use env"
6156
run: |
62-
. .venv/bin/activate
63-
TEST_SCRIPT="test-env.sh" ./.github/resources/scripts/e2e-test.sh
57+
make test-backend-test-env
6458
- name: "use volume"
6559
run: |
66-
. .venv/bin/activate
67-
TEST_SCRIPT="test-volume.sh" ./.github/resources/scripts/e2e-test.sh
60+
make test-backend-test-volume
6861
- name: Collect test results
6962
if: always()
7063
uses: actions/upload-artifact@v4

.github/workflows/e2e-test.yml

Lines changed: 12 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,8 @@ jobs:
3737
with:
3838
k8s_version: ${{ matrix.k8s_version }}
3939

40-
- name: Forward API port
41-
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
42-
43-
- name: Initialization tests v1
44-
working-directory: ./backend/test/initialization
45-
run: go test -v ./... -namespace kubeflow -args -runIntegrationTests=true
40+
- name: Forward Port and initialize tests v1
41+
run: make test-e2e-initialization-tests-v1
4642

4743
- name: Collect test results
4844
if: always()
@@ -71,13 +67,8 @@ jobs:
7167
with:
7268
k8s_version: ${{ matrix.k8s_version }}
7369

74-
75-
- name: Forward API port
76-
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
77-
7870
- name: Initialization tests v2
79-
working-directory: ./backend/test/v2/initialization
80-
run: go test -v ./... -namespace kubeflow -args -runIntegrationTests=true
71+
run: make test-e2e-initialization-tests-v2
8172

8273
- name: Collect test results
8374
if: always()
@@ -106,15 +97,8 @@ jobs:
10697
with:
10798
k8s_version: ${{ matrix.k8s_version }}
10899

109-
- name: Forward API port
110-
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
111-
112-
- name: Forward MySQL port
113-
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "mysql" 3306 3306
114-
115100
- name: API integration tests v1
116-
working-directory: ./backend/test/integration
117-
run: go test -v ./... -namespace kubeflow -args -runIntegrationTests=true
101+
run: make test-e2e-api-integration-tests-v1
118102

119103
- name: Collect test results
120104
if: always()
@@ -143,13 +127,9 @@ jobs:
143127
with:
144128
k8s_version: ${{ matrix.k8s_version }}
145129

146-
- name: Forward API port
147-
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
148-
149130
- name: API integration tests v2
150-
working-directory: ./backend/test/v2/integration
151-
run: go test -v ./... -namespace kubeflow -args -runIntegrationTests=true
152-
131+
run: make test-e2e-api-integration-tests-v2
132+
153133
- name: Collect test results
154134
if: always()
155135
uses: actions/upload-artifact@v4
@@ -177,19 +157,9 @@ jobs:
177157
with:
178158
k8s_version: ${{ matrix.k8s_version }}
179159

180-
- name: Forward API port
181-
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
182-
183-
- name: Forward Frontend port
184-
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline-ui" 3000 3000
185-
186-
- name: Build frontend integration tests image
187-
working-directory: ./test/frontend-integration-test
188-
run: docker build . -t kfp-frontend-integration-test:local
189-
190-
- name: Frontend integration tests
191-
run: docker run --net=host kfp-frontend-integration-test:local --remote-run true
192-
160+
- name: Forward API port and run integration test
161+
run: make test-e2e-frontend-integration-test
162+
193163
- name: Collect test results
194164
if: always()
195165
uses: actions/upload-artifact@v4
@@ -217,18 +187,9 @@ jobs:
217187
with:
218188
k8s_version: ${{ matrix.k8s_version }}
219189

220-
- name: Forward API port
221-
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
222-
223-
- name: Install prerequisites
224-
run: pip3 install -r ./test/sample-test/requirements.txt
225-
226-
- name: Basic sample tests - sequential
227-
run: python3 ./test/sample-test/sample_test_launcher.py sample_test run_test --namespace kubeflow --test-name sequential --results-gcs-dir output
228-
229-
- name: Basic sample tests - exit_handler
230-
run: python3 ./test/sample-test/sample_test_launcher.py sample_test run_test --namespace kubeflow --test-name exit_handler --expected-result failed --results-gcs-dir output
231-
190+
- name: Forward API port and run integration tests
191+
run: make test-e2e-basic-sample-tests
192+
232193
- name: Collect test results
233194
if: always()
234195
uses: actions/upload-artifact@v4

.github/workflows/frontend.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,9 @@ jobs:
2424
with:
2525
node-version: '22'
2626

27-
- name: Clean npm cache
28-
run: npm cache clean --force
29-
30-
- name: Install dependencies
31-
run: cd ./frontend && npm ci
27+
- name: Setup frontend test
28+
run: make setup-frontend-test
3229

3330
- name: Run Frontend Tests
34-
run: cd ./frontend && npm run test:ci
31+
run: make test-frontend
3532

.github/workflows/gcpc-modules-tests.yml

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,36 +21,8 @@ jobs:
2121
with:
2222
python-version: 3.9
2323

24-
- name: apt-get update
25-
run: sudo apt-get update
26-
27-
- name: Install protobuf-compiler
28-
run: sudo apt-get install protobuf-compiler -y
29-
30-
- name: Install setuptools
31-
run: |
32-
pip3 install setuptools
33-
pip3 freeze
34-
35-
- name: Install Wheel
36-
run: pip3 install wheel==0.42.0
37-
38-
- name: Install python sdk
39-
run: pip install sdk/python
40-
41-
- name: Generate API proto files
42-
working-directory: ./api
43-
run: make clean python
44-
45-
- name: Install kfp-pipeline-spec from source
46-
run: |
47-
python3 -m pip install api/v2alpha1/python
48-
49-
- name: Install google-cloud component
50-
run: pip install components/google-cloud
51-
52-
- name: Install Pytest
53-
run: pip install $(grep 'pytest==' sdk/python/requirements-dev.txt)
24+
- name: Install requirements
25+
run: make setup-grpc-modules-test
5426

5527
- name: Run test
56-
run: pytest ./test/gcpc-tests/run_all_gcpc_modules.py
28+
run: make test-grpc-modules

.github/workflows/kfp-kubernetes-execution-tests.yml

Lines changed: 4 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -33,47 +33,8 @@ jobs:
3333
with:
3434
k8s_version: ${{ matrix.k8s_version }}
3535

36-
- name: Forward API port
37-
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
36+
- name: Install requirements
37+
run: make setup-kfp-kubernetes-execution-tests-without-kfp
3838

39-
- name: apt-get update
40-
run: sudo apt-get update
41-
42-
- name: Install protobuf-compiler
43-
run: sudo apt-get install protobuf-compiler -y
44-
45-
- name: Install setuptools
46-
run: |
47-
pip3 install setuptools
48-
pip3 freeze
49-
50-
- name: Install Wheel
51-
run: pip3 install wheel==0.42.0
52-
53-
- name: Install protobuf
54-
run: pip3 install protobuf==4.25.3
55-
56-
- name: Generate API proto files
57-
working-directory: ./api
58-
run: make clean python
59-
60-
- name: Install kfp-pipeline-spec from source
61-
run: |
62-
python3 -m pip install api/v2alpha1/python
63-
64-
- name: Generate kfp-kubernetes proto files from source
65-
working-directory: ./kubernetes_platform
66-
run: make clean python
67-
68-
- name: Install kfp-kubernetes from source
69-
run: |
70-
pip install -e ./kubernetes_platform/python[dev]
71-
72-
- name: Install requirements
73-
run: pip install -r ./test/kfp-kubernetes-execution-tests/requirements.txt
74-
75-
- name: Run tests
76-
run: |
77-
export KFP_ENDPOINT="http://localhost:8888"
78-
export TIMEOUT_SECONDS=2700
79-
pytest ./test/kfp-kubernetes-execution-tests/sdk_execution_tests.py --asyncio-task-timeout $TIMEOUT_SECONDS
39+
- name: Forward port and run tests
40+
run: make test-kfp-kubernetes-execution-tests

.github/workflows/kfp-kubernetes-library-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ jobs:
3333
python-version: ${{matrix.python.version}}
3434

3535
- name: Run tests
36-
run: ./test/presubmit-test-kfp-kubernetes-library.sh
36+
run: make test-kfp-kubernetes-library-test

.github/workflows/kfp-samples.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ jobs:
3636
with:
3737
k8s_version: ${{ matrix.k8s_version }}
3838

39-
- name: Forward API port
40-
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
41-
42-
- name: Run Samples Tests
39+
- name: Forward port and run samples tests
4340
run: |
44-
./backend/src/v2/test/sample-test.sh
41+
make test-kfp-samples

0 commit comments

Comments
 (0)