Skip to content

Commit c688dd5

Browse files
sandereggsanderegg
committed
modularizing
1 parent 15c27b9 commit c688dd5

File tree

4 files changed

+134
-160
lines changed

4 files changed

+134
-160
lines changed

‎.github/actions/setup-simcore-env/action.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: 'Setup SimCore Environment'
2+
description: 'Sets up the common environment for SimCore CI jobs'
3+
4+
inputs:
5+
python-version:
6+
description: 'Python version to use'
7+
required: false
8+
default: '3.11'
9+
10+
uv-version:
11+
description: 'UV version to use'
12+
required: false
13+
default: '0.6.x'
14+
15+
cache-dependency-glob:
16+
description: 'Glob pattern for cache dependency files'
17+
required: false
18+
default: ''
19+
20+
setup-docker:
21+
description: 'Whether to setup Docker BuildX'
22+
required: false
23+
default: 'true'
24+
25+
show-system-versions:
26+
description: 'Whether to show system versions'
27+
required: false
28+
default: 'true'
29+
30+
runs:
31+
using: 'composite'
32+
steps:
33+
- name: Checkout code
34+
uses: actions/checkout@v4
35+
36+
- name: Setup Docker BuildX
37+
if: inputs.setup-docker == 'true'
38+
id: buildx
39+
uses: docker/setup-buildx-action@v3
40+
with:
41+
driver: docker-container
42+
43+
- name: Setup Python environment
44+
uses: actions/setup-python@v5
45+
with:
46+
python-version: ${{ inputs.python-version }}
47+
48+
- name: Install UV
49+
uses: astral-sh/setup-uv@v6
50+
with:
51+
version: ${{ inputs.uv-version }}
52+
enable-cache: false
53+
cache-dependency-glob: ${{ inputs.cache-dependency-glob }}
54+
55+
- name: Show system versions
56+
if: inputs.show-system-versions == 'true'
57+
shell: bash
58+
run: ./ci/helpers/show_system_versions.bash

‎.github/actions/setup-system-tests/action.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: 'Setup for System Tests'
2+
description: 'Sets up environment specifically for system test jobs'
3+
4+
inputs:
5+
service-name:
6+
description: 'Name of the service being tested (for cache dependency glob)'
7+
required: true
8+
9+
python-version:
10+
description: 'Python version to use'
11+
required: false
12+
default: '3.11'
13+
14+
runs:
15+
using: 'composite'
16+
steps:
17+
- name: Setup SimCore environment
18+
uses: ./.github/actions/setup-simcore-env
19+
with:
20+
python-version: ${{ inputs.python-version }}
21+
cache-dependency-glob: "**/${{ inputs.service-name }}/requirements/ci.txt"
22+
setup-docker: 'true'
23+
show-system-versions: 'true'

‎.github/actions/setup-unit-tests/action.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: 'Setup for Unit Tests'
2+
description: 'Sets up environment specifically for unit test jobs'
3+
4+
inputs:
5+
service-name:
6+
description: 'Name of the service being tested (for cache dependency glob)'
7+
required: true
8+
9+
python-version:
10+
description: 'Python version to use'
11+
required: false
12+
default: '3.11'
13+
14+
runs:
15+
using: 'composite'
16+
steps:
17+
- name: Setup SimCore environment
18+
uses: ./.github/actions/setup-simcore-env
19+
with:
20+
python-version: ${{ inputs.python-version }}
21+
cache-dependency-glob: "**/${{ inputs.service-name }}/requirements/ci.txt"
22+
setup-docker: 'true'
23+
show-system-versions: 'true'

‎.github/workflows/ci-testing-deploy.yml‎

Lines changed: 30 additions & 160 deletions
Original file line numberDiff line numberDiff line change
@@ -296,24 +296,11 @@ jobs:
296296
os: [ubuntu-24.04]
297297
fail-fast: false
298298
steps:
299-
- uses: actions/checkout@v4
300-
- name: setup docker buildx
301-
id: buildx
302-
uses: docker/setup-buildx-action@v3
303-
with:
304-
driver: docker-container
305-
- name: setup python environment
306-
uses: actions/setup-python@v5
299+
- name: Setup environment
300+
uses: ./.github/actions/setup-unit-tests
307301
with:
302+
service-name: "web/server"
308303
python-version: ${{ matrix.python }}
309-
- name: install uv
310-
uses: astral-sh/setup-uv@v6
311-
with:
312-
version: "0.6.x"
313-
enable-cache: false
314-
cache-dependency-glob: "**/web/server/requirements/ci.txt"
315-
- name: show system version
316-
run: ./ci/helpers/show_system_versions.bash
317304
- name: install webserver
318305
run: ./ci/github/unit-testing/webserver.bash install
319306
- name: typecheck
@@ -344,24 +331,11 @@ jobs:
344331
os: [ubuntu-24.04]
345332
fail-fast: false
346333
steps:
347-
- uses: actions/checkout@v4
348-
- name: setup docker buildx
349-
id: buildx
350-
uses: docker/setup-buildx-action@v3
351-
with:
352-
driver: docker-container
353-
- name: setup python environment
354-
uses: actions/setup-python@v5
334+
- name: Setup environment
335+
uses: ./.github/actions/setup-unit-tests
355336
with:
337+
service-name: "webserver"
356338
python-version: ${{ matrix.python }}
357-
- name: install uv
358-
uses: astral-sh/setup-uv@v6
359-
with:
360-
version: "0.6.x"
361-
enable-cache: false
362-
cache-dependency-glob: "**/web/server/requirements/ci.txt"
363-
- name: show system version
364-
run: ./ci/helpers/show_system_versions.bash
365339
- name: install webserver
366340
run: ./ci/github/unit-testing/webserver.bash install
367341
- name: test
@@ -386,24 +360,11 @@ jobs:
386360
os: [ubuntu-24.04]
387361
fail-fast: false
388362
steps:
389-
- uses: actions/checkout@v4
390-
- name: setup docker buildx
391-
id: buildx
392-
uses: docker/setup-buildx-action@v3
393-
with:
394-
driver: docker-container
395-
- name: setup python environment
396-
uses: actions/setup-python@v5
363+
- name: Setup environment
364+
uses: ./.github/actions/setup-unit-tests
397365
with:
366+
service-name: "webserver"
398367
python-version: ${{ matrix.python }}
399-
- name: install uv
400-
uses: astral-sh/setup-uv@v6
401-
with:
402-
version: "0.6.x"
403-
enable-cache: false
404-
cache-dependency-glob: "**/web/server/requirements/ci.txt"
405-
- name: show system version
406-
run: ./ci/helpers/show_system_versions.bash
407368
- name: install webserver
408369
run: ./ci/github/unit-testing/webserver.bash install
409370
- name: test
@@ -428,24 +389,11 @@ jobs:
428389
os: [ubuntu-24.04]
429390
fail-fast: false
430391
steps:
431-
- uses: actions/checkout@v4
432-
- name: setup docker buildx
433-
id: buildx
434-
uses: docker/setup-buildx-action@v3
435-
with:
436-
driver: docker-container
437-
- name: setup python environment
438-
uses: actions/setup-python@v5
392+
- name: Setup environment
393+
uses: ./.github/actions/setup-unit-tests
439394
with:
395+
service-name: "webserver"
440396
python-version: ${{ matrix.python }}
441-
- name: install uv
442-
uses: astral-sh/setup-uv@v6
443-
with:
444-
version: "0.6.x"
445-
enable-cache: false
446-
cache-dependency-glob: "**/web/server/requirements/ci.txt"
447-
- name: show system version
448-
run: ./ci/helpers/show_system_versions.bash
449397
- name: install webserver
450398
run: ./ci/github/unit-testing/webserver.bash install
451399
- name: test
@@ -473,24 +421,11 @@ jobs:
473421
os: [ubuntu-24.04]
474422
fail-fast: false
475423
steps:
476-
- uses: actions/checkout@v4
477-
- name: setup docker buildx
478-
id: buildx
479-
uses: docker/setup-buildx-action@v3
480-
with:
481-
driver: docker-container
482-
- name: setup python environment
483-
uses: actions/setup-python@v5
424+
- name: Setup environment
425+
uses: ./.github/actions/setup-unit-tests
484426
with:
427+
service-name: "storage"
485428
python-version: ${{ matrix.python }}
486-
- name: install uv
487-
uses: astral-sh/setup-uv@v6
488-
with:
489-
version: "0.6.x"
490-
enable-cache: false
491-
cache-dependency-glob: "**/storage/requirements/ci.txt"
492-
- name: show system version
493-
run: ./ci/helpers/show_system_versions.bash
494429
- name: install
495430
run: ./ci/github/unit-testing/storage.bash install
496431
- name: typecheck
@@ -518,26 +453,13 @@ jobs:
518453
os: [ubuntu-24.04]
519454
fail-fast: false
520455
steps:
521-
- uses: actions/checkout@v4
522-
- name: setup docker buildx
523-
id: buildx
524-
uses: docker/setup-buildx-action@v3
525-
with:
526-
driver: docker-container
527-
- name: setup python environment
528-
uses: actions/setup-python@v5
456+
- name: Setup environment
457+
uses: ./.github/actions/setup-unit-tests
529458
with:
459+
service-name: "agent"
530460
python-version: ${{ matrix.python }}
531461
- name: install rclone
532462
run: sudo ./ci/github/helpers/install_rclone.bash
533-
- name: install uv
534-
uses: astral-sh/setup-uv@v6
535-
with:
536-
version: "0.6.x"
537-
enable-cache: false
538-
cache-dependency-glob: "**/agent/requirements/ci.txt"
539-
- name: show system version
540-
run: ./ci/helpers/show_system_versions.bash
541463
- name: install
542464
run: ./ci/github/unit-testing/agent.bash install
543465
- name: typecheck
@@ -564,24 +486,11 @@ jobs:
564486
os: [ubuntu-24.04]
565487
fail-fast: false
566488
steps:
567-
- uses: actions/checkout@v4
568-
- name: setup docker buildx
569-
id: buildx
570-
uses: docker/setup-buildx-action@v3
571-
with:
572-
driver: docker-container
573-
- name: setup python environment
574-
uses: actions/setup-python@v5
489+
- name: Setup environment
490+
uses: ./.github/actions/setup-unit-tests
575491
with:
492+
service-name: "notifications"
576493
python-version: ${{ matrix.python }}
577-
- name: install uv
578-
uses: astral-sh/setup-uv@v6
579-
with:
580-
version: "0.6.x"
581-
enable-cache: false
582-
cache-dependency-glob: "**/notifications/requirements/ci.txt"
583-
- name: show system version
584-
run: ./ci/helpers/show_system_versions.bash
585494
- name: install
586495
run: ./ci/github/unit-testing/notifications.bash install
587496
- name: typecheck
@@ -608,24 +517,11 @@ jobs:
608517
os: [ubuntu-24.04]
609518
fail-fast: false
610519
steps:
611-
- uses: actions/checkout@v4
612-
- name: setup docker buildx
613-
id: buildx
614-
uses: docker/setup-buildx-action@v3
615-
with:
616-
driver: docker-container
617-
- name: setup python environment
618-
uses: actions/setup-python@v5
520+
- name: Setup environment
521+
uses: ./.github/actions/setup-unit-tests
619522
with:
523+
service-name: "api"
620524
python-version: ${{ matrix.python }}
621-
- name: install uv
622-
uses: astral-sh/setup-uv@v6
623-
with:
624-
version: "0.6.x"
625-
enable-cache: false
626-
cache-dependency-glob: "**/api/tests/requirements.txt"
627-
- name: show system version
628-
run: ./ci/helpers/show_system_versions.bash
629525
- name: install api
630526
run: ./ci/github/unit-testing/api.bash install
631527
- name: test
@@ -650,24 +546,11 @@ jobs:
650546
os: [ubuntu-24.04]
651547
fail-fast: false
652548
steps:
653-
- uses: actions/checkout@v4
654-
- name: setup docker buildx
655-
id: buildx
656-
uses: docker/setup-buildx-action@v3
657-
with:
658-
driver: docker-container
659-
- name: setup python environment
660-
uses: actions/setup-python@v5
549+
- name: Setup environment
550+
uses: ./.github/actions/setup-unit-tests
661551
with:
552+
service-name: "api-server"
662553
python-version: ${{ matrix.python }}
663-
- name: install uv
664-
uses: astral-sh/setup-uv@v6
665-
with:
666-
version: "0.6.x"
667-
enable-cache: false
668-
cache-dependency-glob: "**/api-server/requirements/ci.txt"
669-
- name: show system version
670-
run: ./ci/helpers/show_system_versions.bash
671554
- name: install
672555
run: ./ci/github/unit-testing/api-server.bash install
673556
- name: typecheck
@@ -698,24 +581,11 @@ jobs:
698581
os: [ubuntu-24.04]
699582
fail-fast: false
700583
steps:
701-
- uses: actions/checkout@v4
702-
- name: setup docker buildx
703-
id: buildx
704-
uses: docker/setup-buildx-action@v3
705-
with:
706-
driver: docker-container
707-
- name: setup python environment
708-
uses: actions/setup-python@v5
584+
- name: Setup environment
585+
uses: ./.github/actions/setup-unit-tests
709586
with:
587+
service-name: "autoscaling"
710588
python-version: ${{ matrix.python }}
711-
- name: install uv
712-
uses: astral-sh/setup-uv@v6
713-
with:
714-
version: "0.6.x"
715-
enable-cache: false
716-
cache-dependency-glob: "**/autoscaling/requirements/ci.txt"
717-
- name: show system version
718-
run: ./ci/helpers/show_system_versions.bash
719589
- name: install
720590
run: ./ci/github/unit-testing/autoscaling.bash install
721591
- name: typecheck

0 commit comments

Comments
 (0)