Skip to content

Commit d45b581

Browse files
lekaf974hbelmiro
lekaf974
and
hbelmiro
authored
chore(ci): clean up unnecessary parentheses and fix the formatting of the CI files (kubeflow#11926)
* chore(ci): clean up unnecessary parentheses Signed-off-by: lekaf974 <[email protected]> * chore(ci): update adding missing spaces based on suggestions from code review Co-authored-by: Helber Belmiro <[email protected]> Signed-off-by: Matthieu Evrin <[email protected]> --------- Signed-off-by: lekaf974 <[email protected]> Signed-off-by: Matthieu Evrin <[email protected]> Co-authored-by: Helber Belmiro <[email protected]>
1 parent 3337b5e commit d45b581

File tree

7 files changed

+69
-69
lines changed

7 files changed

+69
-69
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ runs:
3131

3232
- name: Deploy Squid
3333
id: deploy-squid
34-
if: ${{ (inputs.proxy == 'true' )}}
34+
if: ${{ inputs.proxy == 'true' }}
3535
shell: bash
3636
run: ./.github/resources/squid/deploy-squid.sh
3737

‎.github/workflows/e2e-test.yml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,19 @@ jobs:
4343

4444
- name: Forward API port
4545
id: forward-api-port
46-
if: ${{ (steps.create-kfp-cluster.outcome == 'success' )}}
46+
if: ${{ steps.create-kfp-cluster.outcome == 'success' }}
4747
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
4848
continue-on-error: true
4949

5050
- name: Initialization tests v1
5151
id: tests
52-
if: ${{ (steps.forward-api-port.outcome == 'success' )}}
52+
if: ${{ steps.forward-api-port.outcome == 'success' }}
5353
working-directory: ./backend/test/initialization
5454
run: go test -v ./... -namespace kubeflow -args -runIntegrationTests=true
5555
continue-on-error: true
5656

5757
- name: Collect failed logs
58-
if: ${{ (steps.create-kfp-cluster.outcome != 'success' ) || ( steps.forward-api-port.outcome != 'success' ) || ( steps.tests.outcome != 'success' )}}
58+
if: ${{ steps.create-kfp-cluster.outcome != 'success' || steps.forward-api-port.outcome != 'success' || steps.tests.outcome != 'success' }}
5959
run: |
6060
./.github/resources/scripts/collect-logs.sh --ns kubeflow --output /tmp/tmp_pod_log.txt
6161
exit 1
@@ -91,19 +91,19 @@ jobs:
9191

9292
- name: Forward API port
9393
id: forward-api-port
94-
if: ${{ (steps.create-kfp-cluster.outcome == 'success' )}}
94+
if: ${{ steps.create-kfp-cluster.outcome == 'success' }}
9595
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
9696
continue-on-error: true
9797

9898
- name: Initialization tests v2
9999
id: tests
100-
if: ${{ (steps.forward-api-port.outcome == 'success' )}}
100+
if: ${{ steps.forward-api-port.outcome == 'success' }}
101101
working-directory: ./backend/test/v2/initialization
102102
run: go test -v ./... -namespace kubeflow -args -runIntegrationTests=true
103103
continue-on-error: true
104104

105105
- name: Collect failed logs
106-
if: ${{ (steps.create-kfp-cluster.outcome != 'success' ) || ( steps.forward-api-port.outcome != 'success' ) || ( steps.tests.outcome != 'success' )}}
106+
if: ${{ steps.create-kfp-cluster.outcome != 'success' || steps.forward-api-port.outcome != 'success' || steps.tests.outcome != 'success' }}
107107
run: |
108108
./.github/resources/scripts/collect-logs.sh --ns kubeflow --output /tmp/tmp_pod_log.txt
109109
exit 1
@@ -139,25 +139,25 @@ jobs:
139139

140140
- name: Forward API port
141141
id: forward-api-port
142-
if: ${{ (steps.create-kfp-cluster.outcome == 'success' )}}
142+
if: ${{ steps.create-kfp-cluster.outcome == 'success' }}
143143
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
144144
continue-on-error: true
145145

146146
- name: Forward MySQL port
147147
id: forward-mysql-port
148-
if: ${{ (steps.forward-api-port.outcome == 'success' )}}
148+
if: ${{ steps.forward-api-port.outcome == 'success' }}
149149
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "mysql" 3306 3306
150150
continue-on-error: true
151151

152152
- name: API integration tests v1
153153
id: tests
154-
if: ${{ (steps.forward-mysql-port.outcome == 'success' )}}
154+
if: ${{ steps.forward-mysql-port.outcome == 'success' }}
155155
working-directory: ./backend/test/integration
156156
run: go test -v ./... -namespace kubeflow -args -runIntegrationTests=true
157157
continue-on-error: true
158158

159159
- name: Collect failed logs
160-
if: ${{ (steps.create-kfp-cluster.outcome != 'success' ) || ( steps.forward-api-port.outcome != 'success' ) || ( steps.forward-mysql-port.outcome != 'success' ) || ( steps.tests.outcome != 'success' )}}
160+
if: ${{ steps.create-kfp-cluster.outcome != 'success' || steps.forward-api-port.outcome != 'success' || steps.forward-mysql-port.outcome != 'success' || steps.tests.outcome != 'success' }}
161161
run: |
162162
./.github/resources/scripts/collect-logs.sh --ns kubeflow --output /tmp/tmp_pod_log.txt
163163
exit 1
@@ -195,25 +195,25 @@ jobs:
195195

196196
- name: Forward API port
197197
id: forward-api-port
198-
if: ${{ (steps.create-kfp-cluster.outcome == 'success' )}}
198+
if: ${{ steps.create-kfp-cluster.outcome == 'success' }}
199199
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
200200
continue-on-error: true
201201

202202
- name: Forward MLMD port
203203
id: forward-mlmd-port
204-
if: ${{ (steps.forward-api-port.outcome == 'success' )}}
204+
if: ${{ steps.forward-api-port.outcome == 'success' }}
205205
run: kubectl -n kubeflow port-forward svc/metadata-grpc-service 8080:8080 &
206206
continue-on-error: true
207207

208208
- name: API integration tests v2
209209
id: tests
210-
if: ${{ (steps.forward-api-port.outcome == 'success' )}}
210+
if: ${{ steps.forward-api-port.outcome == 'success' }}
211211
working-directory: ./backend/test/v2/integration
212212
run: go test -v ./... -namespace kubeflow -args -runIntegrationTests=true
213213
continue-on-error: true
214214

215215
- name: Collect failed logs
216-
if: ${{ (steps.create-kfp-cluster.outcome != 'success' ) || ( steps.forward-api-port.outcome != 'success' ) || ( steps.forward-mlmd-port.outcome != 'success' ) || ( steps.tests.outcome != 'success' )}}
216+
if: ${{ steps.create-kfp-cluster.outcome != 'success' || steps.forward-api-port.outcome != 'success' || steps.forward-mlmd-port.outcome != 'success' || steps.tests.outcome != 'success' }}
217217
run: |
218218
./.github/resources/scripts/collect-logs.sh --ns kubeflow --output /tmp/tmp_pod_log.txt
219219
exit 1
@@ -250,25 +250,25 @@ jobs:
250250

251251
- name: Forward API port
252252
id: forward-api-port
253-
if: ${{ (steps.create-kfp-cluster.outcome == 'success' )}}
253+
if: ${{ steps.create-kfp-cluster.outcome == 'success' }}
254254
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
255255
continue-on-error: true
256256

257257
- name: Forward MLMD port
258258
id: forward-mlmd-port
259-
if: ${{ (steps.forward-api-port.outcome == 'success' )}}
259+
if: ${{ steps.forward-api-port.outcome == 'success' }}
260260
run: kubectl -n kubeflow port-forward svc/metadata-grpc-service 8080:8080 &
261261
continue-on-error: true
262262

263263
- name: API integration tests v2
264264
id: tests
265-
if: ${{ (steps.forward-mlmd-port.outcome == 'success' )}}
265+
if: ${{ steps.forward-mlmd-port.outcome == 'success' }}
266266
working-directory: ./backend/test/v2/integration
267267
run: go test -v ./... -namespace kubeflow -args -runIntegrationTests=true -useProxy=true
268268
continue-on-error: true
269269

270270
- name: Collect failed logs
271-
if: ${{ (steps.create-kfp-cluster.outcome != 'success' ) || ( steps.forward-api-port.outcome != 'success' ) || ( steps.tests.outcome != 'success' )}}
271+
if: ${{ steps.create-kfp-cluster.outcome != 'success' || steps.forward-api-port.outcome != 'success' || steps.tests.outcome != 'success' }}
272272
run: |
273273
./.github/resources/scripts/collect-logs.sh --ns squid --output /tmp/tmp_squid_pod_log.txt
274274
./.github/resources/scripts/collect-logs.sh --ns kubeflow --output /tmp/tmp_pod_log.txt
@@ -306,25 +306,25 @@ jobs:
306306

307307
- name: Forward API port
308308
id: forward-api-port
309-
if: ${{ (steps.create-kfp-cluster.outcome == 'success' )}}
309+
if: ${{ steps.create-kfp-cluster.outcome == 'success' }}
310310
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
311311
continue-on-error: true
312312

313313
- name: Forward MLMD port
314314
id: forward-mlmd-port
315-
if: ${{ (steps.forward-api-port.outcome == 'success' )}}
315+
if: ${{ steps.forward-api-port.outcome == 'success' }}
316316
run: kubectl -n kubeflow port-forward svc/metadata-grpc-service 8080:8080 &
317317
continue-on-error: true
318318

319319
- name: API integration tests v2
320320
id: tests
321-
if: ${{ (steps.forward-mlmd-port.outcome == 'success' )}}
321+
if: ${{ steps.forward-mlmd-port.outcome == 'success' }}
322322
working-directory: ./backend/test/v2/integration
323323
run: go test -v ./... -namespace kubeflow -args -runIntegrationTests=true -cacheEnabled=false
324324
continue-on-error: true
325325

326326
- name: Collect failed logs
327-
if: ${{ (steps.create-kfp-cluster.outcome != 'success' ) || ( steps.forward-api-port.outcome != 'success' ) || ( steps.tests.outcome != 'success' )}}
327+
if: ${{ steps.create-kfp-cluster.outcome != 'success' || steps.forward-api-port.outcome != 'success' || steps.tests.outcome != 'success' }}
328328
run: |
329329
./.github/resources/scripts/collect-logs.sh --ns kubeflow --output /tmp/tmp_pod_log.txt
330330
exit 1
@@ -360,13 +360,13 @@ jobs:
360360

361361
- name: Forward API port
362362
id: forward-api-port
363-
if: ${{ (steps.create-kfp-cluster.outcome == 'success' )}}
363+
if: ${{ steps.create-kfp-cluster.outcome == 'success' }}
364364
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
365365
continue-on-error: true
366366

367367
- name: Forward Frontend port
368368
id: forward-frontend-port
369-
if: ${{ (steps.forward-api-port.outcome == 'success' )}}
369+
if: ${{ steps.forward-api-port.outcome == 'success' }}
370370
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline-ui" 3000 3000
371371
continue-on-error: true
372372

@@ -376,12 +376,12 @@ jobs:
376376

377377
- name: Frontend integration tests
378378
id: tests
379-
if: ${{ (steps.forward-frontend-port.outcome == 'success' )}}
379+
if: ${{ steps.forward-frontend-port.outcome == 'success' }}
380380
run: docker run --net=host kfp-frontend-integration-test:local --remote-run true
381381
continue-on-error: true
382382

383383
- name: Collect failed logs
384-
if: ${{ (steps.create-kfp-cluster.outcome != 'success' ) || ( steps.forward-api-port.outcome != 'success' ) || ( steps.forward-frontend-port.outcome != 'success' ) || ( steps.tests.outcome != 'success' )}}
384+
if: ${{ steps.create-kfp-cluster.outcome != 'success' || steps.forward-api-port.outcome != 'success' || steps.forward-frontend-port.outcome != 'success' || steps.tests.outcome != 'success' }}
385385
run: |
386386
./.github/resources/scripts/collect-logs.sh --ns kubeflow --output /tmp/tmp_pod_log.txt
387387
exit 1
@@ -417,27 +417,27 @@ jobs:
417417

418418
- name: Forward API port
419419
id: forward-api-port
420-
if: ${{ (steps.create-kfp-cluster.outcome == 'success' )}}
420+
if: ${{ steps.create-kfp-cluster.outcome == 'success' }}
421421
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
422422
continue-on-error: true
423423

424424
- name: Install prerequisites
425-
if: ${{ (steps.create-kfp-cluster.outcome == 'success' )}}
425+
if: ${{ steps.create-kfp-cluster.outcome == 'success' }}
426426
run: pip3 install -r ./test/sample-test/requirements.txt
427427

428428
- name: Basic sample tests - sequential
429-
if: ${{ (steps.create-kfp-cluster.outcome == 'success' )}}
429+
if: ${{ steps.create-kfp-cluster.outcome == 'success' }}
430430
id: sequential-test
431431
run: python3 ./test/sample-test/sample_test_launcher.py sample_test run_test --namespace kubeflow --test-name sequential --results-gcs-dir output
432432

433433
- name: Basic sample tests - exit_handler
434-
if: ${{ (steps.create-kfp-cluster.outcome == 'success' )}}
434+
if: ${{ steps.create-kfp-cluster.outcome == 'success' }}
435435
id: sample-test
436436
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
437437
continue-on-error: true
438438

439439
- name: Collect failed logs
440-
if: ${{ (steps.create-kfp-cluster.outcome != 'success') || (steps.forward-api-port.outcome != 'success') || (steps.sequential-test.outcome != 'success') || (steps.sample-test.outcome != 'success')}}
440+
if: ${{ steps.create-kfp-cluster.outcome != 'success' || steps.forward-api-port.outcome != 'success' || steps.sequential-test.outcome != 'success' || steps.sample-test.outcome != 'success'}}
441441
run: |
442442
./.github/resources/scripts/collect-logs.sh --ns kubeflow --output /tmp/tmp_pod_log.txt
443443
exit 1

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,69 +52,69 @@ jobs:
5252

5353
- name: Forward API port
5454
id: forward-api-port
55-
if: ${{ (steps.create-kfp-cluster.outcome == 'success' )}}
55+
if: ${{ steps.create-kfp-cluster.outcome == 'success' }}
5656
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
5757
continue-on-error: true
5858

5959
- name: apt-get update
6060
id: apt-get-update
61-
if: ${{ (steps.forward-api-port.outcome == 'success' )}}
61+
if: ${{ steps.forward-api-port.outcome == 'success' }}
6262
run: sudo apt-get update
6363

6464
- name: Install protobuf-compiler
6565
id: install-protobuf-compiler
66-
if: ${{ (steps.apt-get-update.outcome == 'success' )}}
66+
if: ${{ steps.apt-get-update.outcome == 'success' }}
6767
run: sudo apt-get install protobuf-compiler -y
6868

6969
- name: Install setuptools
7070
id: install-setuptools
71-
if: ${{ (steps.install-protobuf-compiler.outcome == 'success' )}}
71+
if: ${{ steps.install-protobuf-compiler.outcome == 'success' }}
7272
run: |
7373
pip3 install setuptools
7474
pip3 freeze
7575
7676
- name: Install Wheel
7777
id: install-wheel
78-
if: ${{ (steps.install-setuptools.outcome == 'success' )}}
78+
if: ${{ steps.install-setuptools.outcome == 'success' }}
7979
run: pip3 install wheel==0.42.0
8080

8181
- name: Install protobuf
8282
id: install-protobuf
83-
if: ${{ (steps.install-wheel.outcome == 'success' )}}
83+
if: ${{ steps.install-wheel.outcome == 'success' }}
8484
run: pip3 install protobuf==4.25.3
8585

8686
- name: Generate API proto files
8787
id: generate-api-proto-files
88-
if: ${{ (steps.install-protobuf.outcome == 'success' )}}
88+
if: ${{ steps.install-protobuf.outcome == 'success' }}
8989
working-directory: ./api
9090
run: make clean python
9191

9292
- name: Install kfp-pipeline-spec from source
9393
id: install-kfp-pipeline-spec
94-
if: ${{ (steps.generate-api-proto-files.outcome == 'success' )}}
94+
if: ${{ steps.generate-api-proto-files.outcome == 'success' }}
9595
run: |
9696
python3 -m pip install api/v2alpha1/python
9797
9898
- name: Generate kfp-kubernetes proto files from source
9999
id: generate-kfp-kubernetes-proto-files
100-
if: ${{ (steps.install-kfp-pipeline-spec.outcome == 'success' )}}
100+
if: ${{ steps.install-kfp-pipeline-spec.outcome == 'success' }}
101101
working-directory: ./kubernetes_platform
102102
run: make clean python
103103

104104
- name: Install kfp-kubernetes from source
105105
id: install-kfp-kubernetes
106-
if: ${{ (steps.generate-kfp-kubernetes-proto-files.outcome == 'success' )}}
106+
if: ${{ steps.generate-kfp-kubernetes-proto-files.outcome == 'success' }}
107107
run: |
108108
pip install -e ./kubernetes_platform/python[dev]
109109
110110
- name: Install requirements
111111
id: install-requirements
112-
if: ${{ (steps.install-kfp-kubernetes.outcome == 'success' )}}
112+
if: ${{ steps.install-kfp-kubernetes.outcome == 'success' }}
113113
run: pip install -r ./test/kfp-kubernetes-execution-tests/requirements.txt
114114

115115
- name: Run tests
116116
id: test
117-
if: ${{ (steps.install-requirements.outcome == 'success' )}}
117+
if: ${{ steps.install-requirements.outcome == 'success' }}
118118
env:
119119
PULL_NUMBER: ${{ github.event.pull_request.number }}
120120
REPO_NAME: ${{ github.repository }}
@@ -125,7 +125,7 @@ jobs:
125125
continue-on-error: true
126126

127127
- name: Collect failed logs
128-
if: ${{ (steps.create-kfp-cluster.outcome != 'success') || (steps.forward-api-port.outcome != 'success') || (steps.test.outcome != 'success')}}
128+
if: ${{ steps.create-kfp-cluster.outcome != 'success' || steps.forward-api-port.outcome != 'success' || steps.test.outcome != 'success'}}
129129
run: |
130130
./.github/resources/scripts/collect-logs.sh --ns kubeflow --output /tmp/tmp_pod_log.txt
131131
exit 1

‎.github/workflows/kfp-samples.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,21 @@ jobs:
7171

7272
- name: Build and upload the sample Modelcar image to Kind
7373
id: build-sample-modelcar-image
74-
if: ${{ (steps.create-kfp-cluster.outcome == 'success' )}}
74+
if: ${{ steps.create-kfp-cluster.outcome == 'success' }}
7575
run: |
7676
docker build -f samples/v2/modelcar/Dockerfile -t registry.domain.local/modelcar:test .
7777
kind --name kfp load docker-image registry.domain.local/modelcar:test
7878
continue-on-error: true
7979

8080
- name: Forward API port
8181
id: forward-api-port
82-
if: ${{ (steps.build-sample-modelcar-image.outcome == 'success' )}}
82+
if: ${{ steps.build-sample-modelcar-image.outcome == 'success' }}
8383
run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
8484
continue-on-error: true
8585

8686
- name: Run Samples Tests
8787
id: tests
88-
if: ${{ (steps.forward-api-port.outcome == 'success' )}}
88+
if: ${{ steps.forward-api-port.outcome == 'success' }}
8989
env:
9090
PULL_NUMBER: ${{ github.event.pull_request.number }}
9191
REPO_NAME: ${{ github.repository }}
@@ -94,7 +94,7 @@ jobs:
9494
continue-on-error: true
9595

9696
- name: Collect failed logs
97-
if: ${{ (steps.create-kfp-cluster.outcome != 'success' ) || (steps.forward-api-port.outcome != 'success' ) || ( steps.tests.outcome != 'success' )}}
97+
if: ${{ steps.create-kfp-cluster.outcome != 'success' || steps.forward-api-port.outcome != 'success' || steps.tests.outcome != 'success' }}
9898
run: |
9999
./.github/resources/scripts/collect-logs.sh --ns kubeflow --output /tmp/tmp_pod_log.txt
100100
exit 1

‎.github/workflows/kfp-webhooks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ jobs:
3434

3535
- name: Run Webhook Integration Tests
3636
id: tests
37-
if: ${{ (steps.create-kfp-cluster.outcome == 'success' )}}
37+
if: ${{ steps.create-kfp-cluster.outcome == 'success' }}
3838
run: |
3939
make -C backend/test/integration test-webhook
4040
continue-on-error: true
4141

4242
- name: Collect failed logs
43-
if: ${{ (steps.create-kfp-cluster.outcome != 'success' ) || ( steps.tests.outcome != 'success' )}}
43+
if: ${{ steps.create-kfp-cluster.outcome != 'success' || steps.tests.outcome != 'success' }}
4444
run: |
4545
./.github/resources/scripts/collect-logs.sh --ns kubeflow --output /tmp/tmp_pod_log.txt
4646
exit 1

0 commit comments

Comments
 (0)