diff --git a/.woodpecker/e2e-convert-jetson.yml b/.woodpecker/e2e-convert-jetson.yml index 9d4f9c3..5b28ec5 100644 --- a/.woodpecker/e2e-convert-jetson.yml +++ b/.woodpecker/e2e-convert-jetson.yml @@ -9,6 +9,7 @@ steps: - name: e2e-convert-jetson image: docker environment: + COMPOSE_PROJECT_NAME: detections-e2e-convert-jetson REGISTRY_HOST: from_secret: registry_host REGISTRY_USER: @@ -18,13 +19,19 @@ steps: commands: - apk add --no-cache bash docker-cli-compose - echo "$REGISTRY_TOKEN" | docker login "$REGISTRY_HOST" -u "$REGISTRY_USER" --password-stdin - - cd e2e - - > - E2E_PROFILE=jetson - E2E_WAIT_FOR_ENGINE_ENABLED=1 - E2E_ENGINE_WAIT_TIMEOUT=3600 - E2E_LOG_TAIL=300 - bash run_test.sh tests/test_health_engine.py::TestHealthEngineStep03Warmed - - bash scripts/publish_jetson_engine.sh + - | + cd e2e + cleanup() { + docker compose -f docker-compose.test.yml --profile jetson down -v --remove-orphans || true + } + trap cleanup EXIT + + E2E_PROFILE=jetson \ + E2E_WAIT_FOR_ENGINE_ENABLED=1 \ + E2E_ENGINE_WAIT_TIMEOUT=3600 \ + E2E_LOG_TAIL=300 \ + bash run_test.sh tests/test_health_engine.py::TestHealthEngineStep03Warmed + + bash scripts/publish_jetson_engine.sh volumes: - /var/run/docker.sock:/var/run/docker.sock diff --git a/.woodpecker/e2e-smoke-jetson.yml b/.woodpecker/e2e-smoke-jetson.yml index 3611ae0..102ef07 100644 --- a/.woodpecker/e2e-smoke-jetson.yml +++ b/.woodpecker/e2e-smoke-jetson.yml @@ -9,6 +9,7 @@ steps: - name: e2e-smoke-jetson image: docker environment: + COMPOSE_PROJECT_NAME: detections-e2e-smoke-jetson REGISTRY_HOST: from_secret: registry_host REGISTRY_USER: @@ -18,8 +19,14 @@ steps: commands: - apk add --no-cache bash docker-cli-compose - echo "$REGISTRY_TOKEN" | docker login "$REGISTRY_HOST" -u "$REGISTRY_USER" --password-stdin - - cd e2e - - bash scripts/pull_jetson_engine.sh - - E2E_PROFILE=jetson bash run_test.sh tests/test_health_engine.py + - | + cd e2e + cleanup() { + docker compose -f docker-compose.test.yml --profile jetson down -v --remove-orphans || true + } + trap cleanup EXIT + + bash scripts/pull_jetson_engine.sh + E2E_PROFILE=jetson bash run_test.sh tests/test_health_engine.py volumes: - /var/run/docker.sock:/var/run/docker.sock