diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-11 03:13:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-11 03:13:54 +0300 |
| commit | 2d9c62ffb595d2bf555046d09098a0d4af71e17f (patch) | |
| tree | c837cf91cf3e50f443d1dcb852b82448637a5c8b /.gitlab | |
| parent | d9710d79c52bc73438022e79c79cfe3ab35b084b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/package-and-test/main.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/qa-common/main.gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab/ci/test-on-gdk/main.gitlab-ci.yml | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/.gitlab/ci/package-and-test/main.gitlab-ci.yml b/.gitlab/ci/package-and-test/main.gitlab-ci.yml index 774939c7e44..e90c0bbc7c4 100644 --- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml @@ -523,5 +523,3 @@ notify-slack: extends: - .notify-slack - .rules:report:process-results - variables: - TYPE: "(package-and-test) " diff --git a/.gitlab/ci/qa-common/main.gitlab-ci.yml b/.gitlab/ci/qa-common/main.gitlab-ci.yml index cc0220b12c0..3c83d7ace22 100644 --- a/.gitlab/ci/qa-common/main.gitlab-ci.yml +++ b/.gitlab/ci/qa-common/main.gitlab-ci.yml @@ -252,7 +252,7 @@ stages: - .ruby-image stage: notify variables: - QA_RSPEC_JSON_FILE_PATTERN: $CI_PROJECT_DIR/gitlab-qa-run-*/**/rspec-*.json + QA_RSPEC_XML_FILE_PATTERN: $CI_PROJECT_DIR/gitlab-qa-run-*/**/rspec-*.xml SLACK_ICON_EMOJI: ci_failing STATUS_SYM: ☠️ STATUS: failed @@ -264,7 +264,7 @@ stages: echo "Test suite passed. Exiting..." exit 0 fi - - bundle exec gitlab-qa-report --prepare-stage-reports "$QA_RSPEC_JSON_FILE_PATTERN" # generate summary + - bundle exec gitlab-qa-report --prepare-stage-reports "$QA_RSPEC_XML_FILE_PATTERN" # generate summary - !reference [.notify-slack-qa, script] # ========================================== diff --git a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml index ac23ea75eb1..5cf38d578e5 100644 --- a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml @@ -119,4 +119,4 @@ notify-slack: - .notify-slack - .rules:report:process-results variables: - QA_RSPEC_JSON_FILE_PATTERN: $CI_PROJECT_DIR/test_output/rspec-*.json + QA_RSPEC_XML_FILE_PATTERN: $CI_PROJECT_DIR/test_output/rspec-*.xml |