Commit e7b75f38 authored by Alessio Caiazza's avatar Alessio Caiazza

Merge remote-tracking branch 'origin/cherry-pick-d36f61ef' into 14-10-stable-ee

Force merged according to
https://gitlab.com/gitlab-org/release/tasks/-/issues/3858#note_944235040
parents 459b3357 5b548b5d
...@@ -280,7 +280,9 @@ coverage-frontend: ...@@ -280,7 +280,9 @@ coverage-frontend:
paths: paths:
- coverage-frontend/ - coverage-frontend/
reports: reports:
cobertura: coverage-frontend/cobertura-coverage.xml coverage_report:
coverage_format: cobertura
path: coverage-frontend/cobertura-coverage.xml
.qa-frontend-node: .qa-frontend-node:
extends: extends:
......
...@@ -598,7 +598,9 @@ rspec:coverage: ...@@ -598,7 +598,9 @@ rspec:coverage:
- coverage/assets/ - coverage/assets/
- coverage/lcov/ - coverage/lcov/
reports: reports:
cobertura: coverage/coverage.xml coverage_report:
coverage_format: cobertura
path: coverage/coverage.xml
rspec:undercoverage: rspec:undercoverage:
extends: extends:
......
...@@ -77,7 +77,7 @@ review-build-cng: ...@@ -77,7 +77,7 @@ review-build-cng:
variables: variables:
HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}" HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}" DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
GITLAB_HELM_CHART_REF: "v5.5.0" GITLAB_HELM_CHART_REF: "41d7632d9eba84f5816d808b98ccf3f5623e9fb5"
environment: environment:
name: review/${CI_COMMIT_REF_SLUG}${FREQUENCY} name: review/${CI_COMMIT_REF_SLUG}${FREQUENCY}
url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN} url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment