diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-01 15:09:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-01 15:09:36 +0300 |
commit | 8c438dd7a6063d7f59bce4d79cc7ca49a31a8346 (patch) | |
tree | efaec0e049aca9d0b85d4ca638fb3e031d7b4904 /.gitlab/ci | |
parent | 8ef03669283030d0502a871113f8db013e6ac46c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci')
-rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 10 | ||||
-rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 29 |
2 files changed, 36 insertions, 3 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index b9a2eb3ebc6..2605b3ec8b6 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -144,18 +144,20 @@ review-stop: .allure-report-base: image: - name: ${GITLAB_DEPENDENCY_PROXY}andrcuns/allure-report-publisher:0.0.6 + name: ${GITLAB_DEPENDENCY_PROXY}andrcuns/allure-report-publisher:0.3.1 entrypoint: [""] stage: post-qa variables: GIT_STRATEGY: none STORAGE_CREDENTIALS: $QA_ALLURE_REPORT_GCS_CREDENTIALS + GITLAB_AUTH_TOKEN: $GITLAB_QA_MR_ALLURE_REPORT_TOKEN script: - | allure-report-publisher upload gcs \ --results-glob="qa/gitlab-qa-run-*/**/allure-results/*" \ --bucket="gitlab-qa-allure-reports" \ --prefix="$ALLURE_REPORT_PATH_PREFIX/$CI_COMMIT_REF_SLUG" \ + --update-pr="comment" \ --copy-latest \ --color @@ -231,18 +233,20 @@ parallel-spec-reports: allure-report-qa-smoke: extends: - .allure-report-base - - .review:rules:review-qa-smoke + - .review:rules:review-qa-smoke-report needs: ["review-qa-smoke"] variables: ALLURE_REPORT_PATH_PREFIX: gitlab-review-smoke + ALLURE_JOB_NAME: review-qa-smoke allure-report-qa-all: extends: - .allure-report-base - - .review:rules:review-qa-all + - .review:rules:review-qa-all-report needs: ["review-qa-all"] variables: ALLURE_REPORT_PATH_PREFIX: gitlab-review-all + ALLURE_JOB_NAME: review-qa-all danger-review: extends: diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 4d083541b43..fbc010f90b5 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -1130,6 +1130,22 @@ changes: *code-qa-patterns allow_failure: true +.review:rules:review-qa-smoke-report: + rules: + - <<: *if-not-ee + when: never + - <<: *if-dot-com-gitlab-org-merge-request + changes: *ci-review-patterns + when: always + - <<: *if-dot-com-gitlab-org-merge-request + changes: *frontend-patterns + allow_failure: true + when: always + - <<: *if-dot-com-gitlab-org-merge-request + changes: *code-qa-patterns + allow_failure: true + when: always + .review:rules:review-qa-all: rules: - <<: *if-not-ee @@ -1142,6 +1158,19 @@ changes: *qa-patterns allow_failure: true +.review:rules:review-qa-all-report: + rules: + - <<: *if-not-ee + when: never + - <<: *if-dot-com-gitlab-org-merge-request + changes: *code-patterns + when: manual + allow_failure: true + - <<: *if-dot-com-gitlab-org-merge-request + changes: *qa-patterns + allow_failure: true + when: always + .review:rules:review-cleanup: rules: - <<: *if-not-ee |