diff --git a/deploy/etos-executionspace/Dockerfile b/deploy/etos-executionspace/Dockerfile index 87b479a..4fd047e 100644 --- a/deploy/etos-executionspace/Dockerfile +++ b/deploy/etos-executionspace/Dockerfile @@ -1,7 +1,7 @@ FROM golang:1.22-alpine AS build WORKDIR /tmp/executionspace COPY . . -RUN apk add --no-cache make=4.4.1-r2 git=2.47.1-r0 && make executionspace +RUN apk add --no-cache make=4.4.1-r2 git=2.47.2-r0 && make executionspace FROM alpine:3.17.3 ARG TZ diff --git a/deploy/etos-iut/Dockerfile b/deploy/etos-iut/Dockerfile index 7502f6d..4c171f4 100644 --- a/deploy/etos-iut/Dockerfile +++ b/deploy/etos-iut/Dockerfile @@ -1,7 +1,7 @@ FROM golang:1.22-alpine AS build WORKDIR /tmp/iut COPY . . -RUN apk add --no-cache make=4.4.1-r2 git=2.47.1-r0 && make iut +RUN apk add --no-cache make=4.4.1-r2 git=2.47.2-r0 && make iut FROM alpine:3.17.3 ARG TZ diff --git a/deploy/etos-logarea/Dockerfile b/deploy/etos-logarea/Dockerfile index cca07ea..ecc28b6 100644 --- a/deploy/etos-logarea/Dockerfile +++ b/deploy/etos-logarea/Dockerfile @@ -1,7 +1,7 @@ FROM golang:1.22-alpine AS build WORKDIR /tmp/logarea COPY . . -RUN apk add --no-cache make=4.4.1-r2 git=2.47.1-r0 && make logarea +RUN apk add --no-cache make=4.4.1-r2 git=2.47.2-r0 && make logarea FROM alpine:3.17.3 ARG TZ diff --git a/deploy/etos-sse/Dockerfile b/deploy/etos-sse/Dockerfile index be6873b..68bf232 100644 --- a/deploy/etos-sse/Dockerfile +++ b/deploy/etos-sse/Dockerfile @@ -1,7 +1,7 @@ FROM golang:1.22-alpine AS build WORKDIR /tmp/sse COPY . . -RUN apk add --no-cache make=4.4.1-r2 git=2.47.1-r0 && make sse +RUN apk add --no-cache make=4.4.1-r2 git=2.47.2-r0 && make sse FROM alpine:3.17.3 ARG TZ diff --git a/python/src/etos_api/routers/v0/router.py b/python/src/etos_api/routers/v0/router.py index 9f9dfb3..07c138c 100644 --- a/python/src/etos_api/routers/v0/router.py +++ b/python/src/etos_api/routers/v0/router.py @@ -136,7 +136,10 @@ async def _start(etos: StartEtosRequest, span: Span) -> dict: span.set_attribute("etos.artifact.id", artifact_id) span.set_attribute("etos.artifact.identity", identity) - links = {"CAUSE": artifact_id} + if etos.parent_activity is not None: + links = {"CAUSE": [artifact_id, etos.parent_activity]} + else: + links = {"CAUSE": artifact_id} data = { "selectionStrategy": {"tracker": "Suite Builder", "id": str(uuid4())}, "batchesUri": etos.test_suite_url, diff --git a/python/src/etos_api/routers/v0/schemas.py b/python/src/etos_api/routers/v0/schemas.py index f4084e0..19817c2 100644 --- a/python/src/etos_api/routers/v0/schemas.py +++ b/python/src/etos_api/routers/v0/schemas.py @@ -38,6 +38,7 @@ class StartEtosRequest(EtosRequest): artifact_identity: Optional[str] artifact_id: Optional[UUID] = Field(default=None, validate_default=True) + parent_activity: Optional[UUID] = None test_suite_url: str dataset: Optional[Union[dict, list]] = {} execution_space_provider: Optional[str] = os.getenv(