Skip to content

Commit f9f2775

Browse files
author
Alan Christie
committed
fix: Adds delay to compose declaration
1 parent d8a6a4b commit f9f2775

File tree

2 files changed

+30
-4
lines changed

2 files changed

+30
-4
lines changed

decoder/job-definition-schema.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,18 @@ definitions:
338338
minLength: 1
339339
maxLength: 63
340340
pattern: '^[a-z]{1}[a-z0-9-]*$'
341-
compose-file:
342-
type: string
343-
pattern: '^docker-compose(-[a-z0-9-]{1,})?.yaml$'
341+
compose:
342+
type: object
343+
additionalProperties: false
344+
properties:
345+
file:
346+
type: string
347+
pattern: '^docker-compose(-[a-z0-9-]{1,})?.yaml$'
348+
delay-seconds:
349+
type: integer
350+
minimum: 1
351+
required:
352+
- file
344353
required:
345354
- name
346355
additionalProperties: false

tests/test_validate_job_schema.py

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,24 @@ def test_validate_test_groups_with_compose():
241241
# Arrange
242242
text: Dict[str, Any] = deepcopy(_MINIMAL)
243243
text["test-groups"] = [
244-
{"name": "demo-1", "compose-file": "docker-compose-abc.yaml"}
244+
{"name": "demo-1", "compose": {"file": "docker-compose-abc.yaml"}}
245+
]
246+
247+
# Act
248+
error = decoder.validate_job_schema(text)
249+
250+
# Assert
251+
assert error is None
252+
253+
254+
def test_validate_test_groups_with_compose_delay():
255+
# Arrange
256+
text: Dict[str, Any] = deepcopy(_MINIMAL)
257+
text["test-groups"] = [
258+
{
259+
"name": "demo-1",
260+
"compose": {"file": "docker-compose-abc.yaml", "delay-seconds": 10},
261+
}
245262
]
246263

247264
# Act

0 commit comments

Comments
 (0)