Skip to content

Commit aff6a90

Browse files
kzscisoftkzscisoft
committed
👷 Separate CI further
1 parent 9c0c71f commit aff6a90

File tree

2 files changed

+98
-31
lines changed

2 files changed

+98
-31
lines changed

‎.github/workflows/test_client_ubuntu.yml

Lines changed: 98 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ concurrency:
1818
cancel-in-progress: true
1919

2020
jobs:
21-
online_unit_tests:
21+
client_tests:
2222
runs-on: ubuntu-latest
23-
timeout-minutes: 40
23+
timeout-minutes: 30
2424
steps:
2525
- uses: actions/checkout@v4
2626
- name: Set up Python 3.13
@@ -40,12 +40,12 @@ jobs:
4040
SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
4141
SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
4242
run: >-
43-
python -m pytest tests/unit/ -x
44-
-m online -c /dev/null -p no:warnings
43+
python -m pytest -x
44+
-m client -c /dev/null -p no:warnings
4545
-n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
46-
offline_unit_tests:
46+
converters_tests:
4747
runs-on: ubuntu-latest
48-
timeout-minutes: 40
48+
timeout-minutes: 30
4949
steps:
5050
- uses: actions/checkout@v4
5151
- name: Set up Python 3.13
@@ -65,12 +65,12 @@ jobs:
6565
SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
6666
SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
6767
run: >-
68-
python -m pytest tests/unit/ -x
69-
-m offline -c /dev/null -p no:warnings
68+
python -m pytest -x
69+
-m converters -c /dev/null -p no:warnings
7070
-n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
71-
online_functional_tests:
71+
dispatch_tests:
7272
runs-on: ubuntu-latest
73-
timeout-minutes: 40
73+
timeout-minutes: 30
7474
steps:
7575
- uses: actions/checkout@v4
7676
- name: Set up Python 3.13
@@ -82,20 +82,19 @@ jobs:
8282
python -m pip install poetry
8383
poetry self add poetry-plugin-export
8484
poetry export -f requirements.txt --with dev -o requirements.txt --all-extras
85-
python -m pip install torch --index-url https://download.pytorch.org/whl/cpu
8685
python -m pip install -r requirements.txt
8786
python -m pip install .
8887
- name: Test with pytest
8988
env:
9089
SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
9190
SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
9291
run: >-
93-
python -m pytest tests/functional/ -x
94-
-m online -m "not eco" -c /dev/null -p no:warnings
92+
python -m pytest -x
93+
-m dispatch -c /dev/null -p no:warnings
9594
-n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
96-
offline_functional_tests:
95+
run_tests_online:
9796
runs-on: ubuntu-latest
98-
timeout-minutes: 40
97+
timeout-minutes: 30
9998
steps:
10099
- uses: actions/checkout@v4
101100
- name: Set up Python 3.13
@@ -115,12 +114,12 @@ jobs:
115114
SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
116115
SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
117116
run: >-
118-
python -m pytest tests/functional/ -x
119-
-m offline -c /dev/null -p no:warnings
117+
python -m pytest -x
118+
-m run -m online -c /dev/null -p no:warnings
120119
-n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
121-
other_unit_tests:
120+
run_tests_offline:
122121
runs-on: ubuntu-latest
123-
timeout-minutes: 40
122+
timeout-minutes: 30
124123
steps:
125124
- uses: actions/checkout@v4
126125
- name: Set up Python 3.13
@@ -140,13 +139,84 @@ jobs:
140139
SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
141140
SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
142141
run: >-
143-
python -m pytest tests/unit/ -x
144-
-m 'not offline' -m 'not online'
145-
-m 'not scenario' -c /dev/null
146-
-p no:warnings -n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
147-
other_functional_tests:
142+
python -m pytest -x
143+
-m run -m offline -c /dev/null -p no:warnings
144+
-n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
145+
config_tests:
148146
runs-on: ubuntu-latest
149-
timeout-minutes: 40
147+
timeout-minutes: 30
148+
steps:
149+
- uses: actions/checkout@v4
150+
- name: Set up Python 3.13
151+
uses: actions/setup-python@v5
152+
with:
153+
python-version: "3.13"
154+
- name: Install dependencies
155+
run: |
156+
python -m pip install poetry
157+
poetry self add poetry-plugin-export
158+
poetry export -f requirements.txt --with dev -o requirements.txt --all-extras
159+
python -m pip install -r requirements.txt
160+
python -m pip install .
161+
- name: Test with pytest
162+
env:
163+
SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
164+
SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
165+
run: >-
166+
python -m pytest -x
167+
-m config -c /dev/null -p no:warnings
168+
-n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
169+
executor_tests:
170+
runs-on: ubuntu-latest
171+
timeout-minutes: 30
172+
steps:
173+
- uses: actions/checkout@v4
174+
- name: Set up Python 3.13
175+
uses: actions/setup-python@v5
176+
with:
177+
python-version: "3.13"
178+
- name: Install dependencies
179+
run: |
180+
python -m pip install poetry
181+
poetry self add poetry-plugin-export
182+
poetry export -f requirements.txt --with dev -o requirements.txt --all-extras
183+
python -m pip install -r requirements.txt
184+
python -m pip install .
185+
- name: Test with pytest
186+
env:
187+
SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
188+
SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
189+
run: >-
190+
python -m pytest -x
191+
-m executor -c /dev/null -p no:warnings
192+
-n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
193+
api_tests:
194+
runs-on: ubuntu-latest
195+
timeout-minutes: 30
196+
steps:
197+
- uses: actions/checkout@v4
198+
- name: Set up Python 3.13
199+
uses: actions/setup-python@v5
200+
with:
201+
python-version: "3.13"
202+
- name: Install dependencies
203+
run: |
204+
python -m pip install poetry
205+
poetry self add poetry-plugin-export
206+
poetry export -f requirements.txt --with dev -o requirements.txt --all-extras
207+
python -m pip install -r requirements.txt
208+
python -m pip install .
209+
- name: Test with pytest
210+
env:
211+
SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
212+
SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
213+
run: >-
214+
python -m pytest -x
215+
-m api -c /dev/null -p no:warnings
216+
-n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
217+
local_tests:
218+
runs-on: ubuntu-latest
219+
timeout-minutes: 30
150220
steps:
151221
- uses: actions/checkout@v4
152222
- name: Set up Python 3.13
@@ -158,15 +228,13 @@ jobs:
158228
python -m pip install poetry
159229
poetry self add poetry-plugin-export
160230
poetry export -f requirements.txt --with dev -o requirements.txt --all-extras
161-
python -m pip install torch --index-url https://download.pytorch.org/whl/cpu
162231
python -m pip install -r requirements.txt
163232
python -m pip install .
164233
- name: Test with pytest
165234
env:
166235
SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
167236
SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
168237
run: >-
169-
python -m pytest tests/functional/ -x
170-
-m 'not offline' -m 'not online'
171-
-m 'not scenario' -c /dev/null
172-
-p no:warnings -n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
238+
python -m pytest -x
239+
-m local -c /dev/null -p no:warnings
240+
-n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache

‎pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ markers = [
107107
"api: tests of RestAPI functionality",
108108
"unix: tests for UNIX systems only",
109109
"metadata: tests of metadata gathering functions",
110-
"proxies: tests for remote/offline Simvue proxies",
111110
"online: tests for online functionality",
112111
"offline: tests for offline functionality",
113112
"local: tests of functionality which do not involve a server or writing to an offline cache file"

0 commit comments

Comments
 (0)