JOJ/JOJ3-config-generator
27
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: force skip teapot on test
All checks were successful
build / build (push) Successful in 2m31s
Details
build / build (pull_request) Successful in 2m30s
Details

Browse Source
This commit is contained in:
张泊明518370910136 2025-03-01 13:00:43 -05:00
parent 279182f659
commit c7917efac7
Signed by: 张泊明518370910136
GPG Key ID: D47306D7062CDA9D
17 changed files with 27 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
joj3_config_generator/convert.py
View File

@ -34,17 +34,15 @@ def convert(repo_conf: repo.Config, task_conf: task.Config) -> result.Config:
stage=result.Stage(
stages=[],
sandbox_token=repo_conf.sandbox_token,
poststages=[get_teapot_stage(repo_conf)],
post_stages=[],
),
)
current_test = os.environ.get("PYTEST_CURRENT_TEST") is not None
# Construct healthcheck stage
if (
not repo_conf.force_skip_health_check_on_test
or os.environ.get("PYTEST_CURRENT_TEST") is None
):
healthcheck_stage = get_healthcheck_config(repo_conf)
result_conf.stage.stages.append(healthcheck_stage)
print(current_test)
if not repo_conf.force_skip_health_check_on_test or not current_test:
result_conf.stage.stages.append(get_healthcheck_config(repo_conf))
stages: List[str] = []
# Convert each stage in the task configuration
for task_stage in task_conf.stages:
@ -56,6 +54,8 @@ def convert(repo_conf: repo.Config, task_conf: task.Config) -> result.Config:
conf_stage = fix_file(task_stage, conf_stage)
conf_stage = fix_diff(task_stage, conf_stage, task_conf)
result_conf.stage.stages.append(conf_stage)
if not repo_conf.force_skip_teapot_on_test or not current_test:
result_conf.stage.post_stages.append(get_teapot_stage(repo_conf))
return result_conf

1
joj3_config_generator/models/repo.py
View File

@ -21,6 +21,7 @@ class Config(BaseModel):
sandbox_token: str = Field("")
max_total_score: int = Field(100)
force_skip_health_check_on_test: bool = False
force_skip_teapot_on_test: bool = False
groups: Groups = Groups()
root: Path = Path(".")
path: Path = Path("repo.toml")

4
joj3_config_generator/models/result.py
View File

@ -142,8 +142,8 @@ class Stage(BaseModel):
"/tmp/joj3_result.json", serialization_alias="outputPath"
) # nosec: B108
stages: List[StageDetail]
prestages: Optional[List[StageDetail]] = None
poststages: List[StageDetail]
pre_stages: List[StageDetail] = Field([], serialization_alias="preStages")
post_stages: List[StageDetail] = Field([], serialization_alias="postStages")
class Config(BaseModel):

1
joj3_config_generator/processers/repo.py
View File

@ -1,6 +1,5 @@
import hashlib
import shlex
import socket
from pathlib import Path
from joj3_config_generator.models import repo, result

1
joj3_config_generator/processers/task.py
View File

@ -1,6 +1,5 @@
import re
import shlex
from pathlib import Path
from typing import List, Tuple
from joj3_config_generator.models import result, task

3
tests/convert/basic/task.json
View File

@ -765,7 +765,8 @@
]
}
],
"poststages": [
"preStages": [],
"postStages": [
{
"name": "teapot",
"group": "",

1
tests/convert/clang-tidy/repo.toml
View File

@ -1 +1,2 @@
force_skip_health_check_on_test = true
force_skip_teapot_on_test = true

58
tests/convert/clang-tidy/task.json
View File

@ -141,61 +141,7 @@
]
}
],
"poststages": [
{
"name": "teapot",
"group": "",
"executor": {
"name": "local",
"with": {
"default": {
"args": [
"/usr/local/bin/joint-teapot",
"joj3-all-env",
"/home/tt/.config/teapot/teapot.env",
"--grading-repo-name",
"ece280-joj",
"--max-total-score",
"100"
],
"env": [
"LOG_FILE_PATH=/home/tt/.cache/joint-teapot-debug.log"
],
"cpuLimit": 0,
"realCpuLimit": 0,
"clockLimit": 2,
"memoryLimit": 128000000,
"stackLimit": 0,
"procLimit": 50,
"cpuRateLimit": 0,
"cpuSetLimit": "",
"copyIn": {},
"copyInCached": {},
"copyInDir": ".",
"copyOut": [
"stdout",
"stderr"
],
"copyOutCached": [],
"copyOutMax": 0,
"copyOutDir": "",
"tty": false,
"strictMemoryLimit": false,
"dataSegmentLimit": false,
"addressSpaceLimit": false
},
"cases": []
}
},
"parsers": [
{
"name": "log",
"with": {
"msg": "joj3 summary"
}
}
]
}
]
"preStages": [],
"postStages": []
}
}

1
tests/convert/cppcheck/repo.toml
View File

@ -1 +1,2 @@
force_skip_health_check_on_test = true
force_skip_teapot_on_test = true

58
tests/convert/cppcheck/task.json
View File

@ -111,61 +111,7 @@
]
}
],
"poststages": [
{
"name": "teapot",
"group": "",
"executor": {
"name": "local",
"with": {
"default": {
"args": [
"/usr/local/bin/joint-teapot",
"joj3-all-env",
"/home/tt/.config/teapot/teapot.env",
"--grading-repo-name",
"ece280-joj",
"--max-total-score",
"100"
],
"env": [
"LOG_FILE_PATH=/home/tt/.cache/joint-teapot-debug.log"
],
"cpuLimit": 0,
"realCpuLimit": 0,
"clockLimit": 2,
"memoryLimit": 128000000,
"stackLimit": 0,
"procLimit": 50,
"cpuRateLimit": 0,
"cpuSetLimit": "",
"copyIn": {},
"copyInCached": {},
"copyInDir": ".",
"copyOut": [
"stdout",
"stderr"
],
"copyOutCached": [],
"copyOutMax": 0,
"copyOutDir": "",
"tty": false,
"strictMemoryLimit": false,
"dataSegmentLimit": false,
"addressSpaceLimit": false
},
"cases": []
}
},
"parsers": [
{
"name": "log",
"with": {
"msg": "joj3 summary"
}
}
]
}
]
"preStages": [],
"postStages": []
}
}

1
tests/convert/cpplint/repo.toml
View File

@ -1 +1,2 @@
force_skip_health_check_on_test = true
force_skip_teapot_on_test = true

58
tests/convert/cpplint/task.json
View File

@ -113,61 +113,7 @@
]
}
],
"poststages": [
{
"name": "teapot",
"group": "",
"executor": {
"name": "local",
"with": {
"default": {
"args": [
"/usr/local/bin/joint-teapot",
"joj3-all-env",
"/home/tt/.config/teapot/teapot.env",
"--grading-repo-name",
"ece280-joj",
"--max-total-score",
"100"
],
"env": [
"LOG_FILE_PATH=/home/tt/.cache/joint-teapot-debug.log"
],
"cpuLimit": 0,
"realCpuLimit": 0,
"clockLimit": 2,
"memoryLimit": 128000000,
"stackLimit": 0,
"procLimit": 50,
"cpuRateLimit": 0,
"cpuSetLimit": "",
"copyIn": {},
"copyInCached": {},
"copyInDir": ".",
"copyOut": [
"stdout",
"stderr"
],
"copyOutCached": [],
"copyOutMax": 0,
"copyOutDir": "",
"tty": false,
"strictMemoryLimit": false,
"dataSegmentLimit": false,
"addressSpaceLimit": false
},
"cases": []
}
},
"parsers": [
{
"name": "log",
"with": {
"msg": "joj3 summary"
}
}
]
}
]
"preStages": [],
"postStages": []
}
}

1
tests/convert/diff/repo.toml
View File

@ -1 +1,2 @@
force_skip_health_check_on_test = true
force_skip_teapot_on_test = true

58
tests/convert/diff/task.json
View File

@ -138,61 +138,7 @@
]
}
],
"poststages": [
{
"name": "teapot",
"group": "",
"executor": {
"name": "local",
"with": {
"default": {
"args": [
"/usr/local/bin/joint-teapot",
"joj3-all-env",
"/home/tt/.config/teapot/teapot.env",
"--grading-repo-name",
"ece280-joj",
"--max-total-score",
"100"
],
"env": [
"LOG_FILE_PATH=/home/tt/.cache/joint-teapot-debug.log"
],
"cpuLimit": 0,
"realCpuLimit": 0,
"clockLimit": 2,
"memoryLimit": 128000000,
"stackLimit": 0,
"procLimit": 50,
"cpuRateLimit": 0,
"cpuSetLimit": "",
"copyIn": {},
"copyInCached": {},
"copyInDir": ".",
"copyOut": [
"stdout",
"stderr"
],
"copyOutCached": [],
"copyOutMax": 0,
"copyOutDir": "",
"tty": false,
"strictMemoryLimit": false,
"dataSegmentLimit": false,
"addressSpaceLimit": false
},
"cases": []
}
},
"parsers": [
{
"name": "log",
"with": {
"msg": "joj3 summary"
}
}
]
}
]
"preStages": [],
"postStages": []
}
}

1
tests/convert/keyword/repo.toml
View File

@ -1 +1,2 @@
force_skip_health_check_on_test = true
force_skip_teapot_on_test = true

58
tests/convert/keyword/task.json
View File

@ -110,61 +110,7 @@
]
}
],
"poststages": [
{
"name": "teapot",
"group": "",
"executor": {
"name": "local",
"with": {
"default": {
"args": [
"/usr/local/bin/joint-teapot",
"joj3-all-env",
"/home/tt/.config/teapot/teapot.env",
"--grading-repo-name",
"ece280-joj",
"--max-total-score",
"100"
],
"env": [
"LOG_FILE_PATH=/home/tt/.cache/joint-teapot-debug.log"
],
"cpuLimit": 0,
"realCpuLimit": 0,
"clockLimit": 2,
"memoryLimit": 128000000,
"stackLimit": 0,
"procLimit": 50,
"cpuRateLimit": 0,
"cpuSetLimit": "",
"copyIn": {},
"copyInCached": {},
"copyInDir": ".",
"copyOut": [
"stdout",
"stderr"
],
"copyOutCached": [],
"copyOutMax": 0,
"copyOutDir": "",
"tty": false,
"strictMemoryLimit": false,
"dataSegmentLimit": false,
"addressSpaceLimit": false
},
"cases": []
}
},
"parsers": [
{
"name": "log",
"with": {
"msg": "joj3 summary"
}
}
]
}
]
"preStages": [],
"postStages": []
}
}

2
tests/convert_joj1/test_convert_joj1_cases.py
View File

@ -1,5 +1,3 @@
import pytest
from tests.convert_joj1.utils import load_case