diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88c7231..fbdb023 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -146,6 +146,15 @@ build-gateway: - export TEST_IMAGE=${GATEWAY_TEST_IMAGE_NAME} - *build-and-push-script +build-e2e-interface: + extends: + - .build + script: + - export FOLDER=testing/catcher + - export API_IMAGE=${E2E_TEST_IMAGE_NAME} + - docker build ${FOLDER} -f ${FOLDER}/Dockerfile -t ${API_IMAGE} + - docker push ${API_IMAGE} + .test-script: &test-script - docker compose -f ${FOLDER}/docker-compose.dev.yml --env-file $ENV_DEV_FILE down - docker compose -f ${FOLDER}/docker-compose.dev.yml --env-file $ENV_DEV_FILE pull @@ -390,6 +399,29 @@ test-screen-integration: artifacts: false - job: test-browser-integration optional: true + artifacts: false + - *needs-backend-tests + +test-e2e-interface: + stage: test + tags: + - dev + rules: + - *changes-frontend + - *changes-backend + script: + - export API_IMAGE=${E2E_TEST_IMAGE_NAME} + - export FOLDER=testing/catcher + - *test-integration + after_script: + - *test-integration-clean + needs: + - job: test-browser-integration + optional: true + artifacts: false + - job: test-screen-integration + optional: true + artifacts: false - *needs-backend-tests deliver-dockerhub: diff --git a/testing/catcher/docker-compose.yml b/testing/catcher/docker-compose.dev.yml similarity index 100% rename from testing/catcher/docker-compose.yml rename to testing/catcher/docker-compose.dev.yml diff --git a/testing/newman/docker-compose.yml b/testing/newman/docker-compose.dev.yml similarity index 100% rename from testing/newman/docker-compose.yml rename to testing/newman/docker-compose.dev.yml diff --git a/testing/tavern/docker-compose.yml b/testing/tavern/docker-compose.dev.yml similarity index 100% rename from testing/tavern/docker-compose.yml rename to testing/tavern/docker-compose.dev.yml