Skip to content

Commit 4f75f6a

Browse files
ci: adding ubuntu 251 and 252 (#3626)
* ci: adding ubuntu 251 and 252. * chore: adding changelog file 3626.maintenance.md [dependabot-skip] * ci: fix latest * test: removing database testing * feat: skipping test database on 25.2 and on CICD. * tests: skipping dpf on 252 * feat: adding students * feat: skipping all the db tests * ci: removing v25.2 since it is in latest * ci: increasing timeout * chore: adding changelog file 3626.dependencies.md [dependabot-skip] --------- Co-authored-by: pyansys-ci-bot <[email protected]>
1 parent 06c93c0 commit 4f75f6a

File tree

6 files changed

+26
-9
lines changed

6 files changed

+26
-9
lines changed

.ci/build_matrix.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ versions=(
99
# if added more "latest", change "$LATEST"
1010
'latest-ubuntu'
1111
'latest-ubuntu-student'
12+
'v25.2.0'
1213
'v25.1.0'
14+
'v25.1-ubuntu'
15+
'v25.1-ubuntu-student'
1316
'v24.2.0'
1417
'v24.2-ubuntu'
1518
'v24.2-ubuntu-student'

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ env:
2424
PACKAGE_NAME: 'ansys-mapdl-core'
2525
PACKAGE_NAMESPACE: 'ansys.mapdl.core'
2626
DOCUMENTATION_CNAME: 'mapdl.docs.pyansys.com'
27-
LATEST_VERSION: "242"
27+
LATEST_VERSION: "252"
2828
MAPDL_IMAGE_VERSION_DOCS_BUILD: v24.2-ubuntu-student
2929
MEILISEARCH_API_KEY: ${{ secrets.MEILISEARCH_API_KEY }}
3030
MEILISEARCH_PUBLIC_API_KEY: ${{ secrets.MEILISEARCH_PUBLIC_API_KEY }}
@@ -33,7 +33,7 @@ env:
3333
DPF_PORT: 21004
3434
MAPDL_PACKAGE: ghcr.io/ansys/mapdl
3535
ON_CI: True
36-
PYTEST_ARGUMENTS: '-vvv -rxXsa --color=yes --durations=10 --random-order --random-order-bucket=class --maxfail=10 --reruns 3 --reruns-delay 4 --cov=ansys.mapdl.core --cov-report=html --timeout=40'
36+
PYTEST_ARGUMENTS: '-vvv -rxXsa --color=yes --durations=10 --random-order --random-order-bucket=class --maxfail=10 --reruns 3 --reruns-delay 4 --cov=ansys.mapdl.core --cov-report=html --timeout=180'
3737

3838
BUILD_CHEATSHEET: True
3939
PYMAPDL_DEBUG_TESTING: True

doc/changelog.d/3626.dependencies.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ci: adding ubuntu 251 and 252

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ pymapdl_convert_script = "ansys.mapdl.core.cli:old_pymapdl_convert_script_entry_
118118
pymapdl = "ansys.mapdl.core.cli:main"
119119

120120
[tool.pytest.ini_options]
121-
addopts = "-rxXsa -vvv --maxfail=10 --random-order-bucket=class --random-order --durations=10 --timeout=40"
121+
addopts = "-rxXsa -vvv --maxfail=10 --random-order-bucket=class --random-order --durations=10 --timeout=180"
122122
junit_family = "legacy"
123123
filterwarnings = [
124124
"ignore::FutureWarning",

tests/test_database.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
from ansys.mapdl.core.misc import random_string
3333
from conftest import ON_CI, TestClass
3434

35+
SKIP_ON_VERSIONS = ["22.2", "23.1", "23.2", "24.1", "24.2", "25.1", "25.2"]
36+
3537

3638
@pytest.fixture(scope="session")
3739
def db(mapdl):
@@ -49,9 +51,9 @@ def db(mapdl):
4951
)
5052

5153
## Exceptions
52-
if mapdl_version in ["22.2", "23.1", "23.2", "24.1", "24.2", "25.1"] and ON_CI:
54+
if mapdl_version in SKIP_ON_VERSIONS and ON_CI:
5355
pytest.skip(
54-
f"This MAPDL version ({mapdl_version}) docker image seems to not support DB, but local does."
56+
f"This MAPDL version ({mapdl_version}) docker image seems to not support DB on CICD."
5557
)
5658

5759
if mapdl._server_version < (0, 4, 1): # 2021R2
@@ -84,7 +86,7 @@ def test_database_start_stop(mapdl, cleared):
8486
)
8587

8688
# Exceptions
87-
if mapdl_version in ["22.2", "23.1", "23.2", "24.1", "24.2", "25.1"] and ON_CI:
89+
if mapdl_version in SKIP_ON_VERSIONS and ON_CI:
8890
pytest.skip(
8991
f"This MAPDL version ({mapdl_version}) docker image seems to not support DB, but local does."
9092
)

tests/test_dpf.py

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import pytest
2727

28-
from conftest import HAS_DPF, has_dependency, requires
28+
from conftest import HAS_DPF, ON_CI, has_dependency, requires
2929

3030
if not has_dependency("ansys-dpf-core") or not HAS_DPF:
3131
pytest.skip(allow_module_level=True)
@@ -36,9 +36,20 @@
3636
DPF_PORT = os.environ.get("DPF_PORT", DPF_DEFAULT_PORT) # Set in ci.yaml
3737

3838

39+
@pytest.fixture()
40+
def skip_dpf(mapdl):
41+
mapdl_version = str(mapdl.version)
42+
if mapdl_version in ["25.2"] and ON_CI:
43+
pytest.skip(
44+
f"This MAPDL version ({mapdl_version}) docker image seems to not support DPF on CICD.",
45+
allow_module_level=True,
46+
)
47+
return
48+
49+
3950
@requires("dpf")
4051
@requires("ansys-dpf-core")
41-
def test_dpf_connection():
52+
def test_dpf_connection(skip_dpf):
4253
# uses 127.0.0.1 and port 50054 by default
4354
try:
4455
grpc_con = dpf.connect_to_server(port=DPF_PORT)
@@ -50,7 +61,7 @@ def test_dpf_connection():
5061

5162
@requires("dpf")
5263
@requires("ansys-dpf-core")
53-
def test_upload(mapdl, solved_box, tmpdir):
64+
def test_upload(skip_dpf, mapdl, solved_box, tmpdir):
5465
# Download RST file
5566
rst_path = mapdl.download_result(str(tmpdir.mkdir("tmpdir")))
5667

0 commit comments

Comments
 (0)