Skip to content

#91: Added accelerator to test configuration #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

- name: Check Version(s)
run: |
poetry run -- version-check exasol_script_languages_container_ci/version.py
poetry run -- nox -s version:check -- exasol/slc_ci/version.py


build-matrix:
Expand Down
1 change: 1 addition & 0 deletions doc/changes/unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
- #83: Implement CI for Github workflows - run-tests
- #87: Use remote part for base ref option
- #89: Implement CI for Github workflows - get-test-matrix
- #91: Add accelerator to test configuration


## Bugs
Expand Down
8 changes: 8 additions & 0 deletions exasol/slc_ci/lib/ci_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from typing import Optional, Protocol, Tuple

from exasol.slc.api.run_db_tests import run_db_test
from exasol.slc.models.accelerator import Accelerator
from exasol.slc.models.test_result import AllTestsResult

from exasol.slc_ci.lib.ci_step_output_printer import (
Expand All @@ -19,6 +20,7 @@ def run(
test_folder: Tuple[str, ...],
test_container_folder: str,
generic_language_tests: Tuple[str, ...],
accelerator: Accelerator,
workers: int,
docker_username: Optional[str],
docker_password: Optional[str],
Expand All @@ -35,6 +37,7 @@ def run(
test_folder: Tuple[str, ...],
test_container_folder: str,
generic_language_tests: Tuple[str, ...],
accelerator: Accelerator,
workers: int,
docker_username: Optional[str],
docker_password: Optional[str],
Expand All @@ -46,6 +49,7 @@ def run(
test_folder=test_folder,
test_container_folder=test_container_folder,
generic_language_test=generic_language_tests,
accelerator=accelerator,
workers=workers,
source_docker_username=docker_username,
source_docker_password=docker_password,
Expand All @@ -72,6 +76,7 @@ def execute_tests(
goal: str,
test_folder: str,
generic_language_tests: Tuple[str, ...],
accelerator: Accelerator,
docker_user: str,
docker_password: str,
test_container_folder: str,
Expand All @@ -85,6 +90,7 @@ def execute_tests(
slc_path=slc_path,
test_folder=test_folder,
generic_language_tests=generic_language_tests,
accelerator=accelerator,
docker_user=docker_user,
docker_password=docker_password,
test_container_folder=test_container_folder,
Expand All @@ -100,6 +106,7 @@ def _run_db_tests(
goal: str,
test_folder: str,
generic_language_tests: Tuple[str, ...],
accelerator: Accelerator,
docker_user: str,
docker_password: str,
test_container_folder: str,
Expand All @@ -110,6 +117,7 @@ def _run_db_tests(
test_folder=(test_folder,),
release_goal=(goal,),
generic_language_tests=generic_language_tests,
accelerator=accelerator,
workers=7,
docker_username=docker_user,
docker_password=docker_password,
Expand Down
3 changes: 3 additions & 0 deletions exasol/slc_ci/lib/run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def run_tests(
test_set_folders = [folder for folder in matched_test_set[0].folders]
goal = matched_test_set[0].goal
generic_language_tests = matched_test_set[0].generic_language_tests
accelerator = matched_test_set[0].accelerator
slc_path = Path(slc_directory)
if not slc_path.exists():
raise ValueError(f"{slc_path} does not exist")
Expand All @@ -50,6 +51,7 @@ def run_tests(
goal=goal,
test_folder=test_folder,
generic_language_tests=tuple(),
accelerator=accelerator,
test_container_folder=test_container_folder,
docker_user=docker_user,
docker_password=docker_password,
Expand All @@ -62,6 +64,7 @@ def run_tests(
goal=goal,
test_folder="",
generic_language_tests=tuple(generic_language_tests),
accelerator=accelerator,
test_container_folder=test_container_folder,
docker_user=docker_user,
docker_password=docker_password,
Expand Down
2 changes: 2 additions & 0 deletions exasol/slc_ci/model/flavor_ci_model.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from typing import List, Optional

from exasol.slc.models.accelerator import Accelerator
from pydantic import BaseModel


Expand All @@ -9,6 +10,7 @@ class TestSet(BaseModel):
goal: str
generic_language_tests: List[str]
test_runner: Optional[str] = None
accelerator: Accelerator = Accelerator.NONE


class TestConfig(BaseModel):
Expand Down
6 changes: 3 additions & 3 deletions exasol/slc_ci/version.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# ATTENTION:
# This file is generated by exasol/toolbox/pre_commit_hooks/package_version.py when using:
# This file is generated by exasol/toolbox/nox/_package_version.py when using:
# * either "poetry run -- nox -s project:fix"
# * or "poetry run -- version-check <path/version.py> --fix"
# * or "poetry run -- nox version:check -- <path/version.py> --fix"
# Do not edit this file manually!
# If you need to change the version, do so in the project.toml, e.g. by using `poetry version X.Y.Z`.
# If you need to change the version, do so in the pyproject.toml, e.g. by using `poetry version X.Y.Z`.
MAJOR = 1
MINOR = 8
PATCH = 0
Expand Down
Loading