diff options
Diffstat (limited to '.gitlab/ci/review-apps/qa.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/review-apps/qa.gitlab-ci.yml | 75 |
1 files changed, 28 insertions, 47 deletions
diff --git a/.gitlab/ci/review-apps/qa.gitlab-ci.yml b/.gitlab/ci/review-apps/qa.gitlab-ci.yml index af4674b802b..4ef6efa2604 100644 --- a/.gitlab/ci/review-apps/qa.gitlab-ci.yml +++ b/.gitlab/ci/review-apps/qa.gitlab-ci.yml @@ -26,35 +26,22 @@ - export CI_ENVIRONMENT_URL="$(cat environment_url.txt)" - echo "${CI_ENVIRONMENT_URL}" - cd qa - - if [ -n "$KNAPSACK_REPORT_PATH" ]; then - bundle exec rake knapsack:download; - fi - artifacts: - paths: - - qa/tmp - expire_in: 7 days - when: always - -.parallel-qa-base: - parallel: 5 - variables: - KNAPSACK_TEST_FILE_PATTERN: "qa/specs/features/**/*_spec.rb" script: - | bin/test "${QA_SCENARIO}" "${CI_ENVIRONMENT_URL}" \ -- \ --color --format documentation \ --format RspecJunitFormatter --out tmp/rspec.xml - after_script: - - if [ -n "$KNAPSACK_GENERATE_REPORT" ]; then - mv qa/${KNAPSACK_REPORT_PATH} qa/knapsack/gcs/regenerated-${CI_NODE_INDEX}.json; - fi artifacts: paths: - - qa/tmp # we can't merge list so need to include explicitly once more - - qa/knapsack/gcs/regenerated-*.json + - qa/tmp reports: junit: qa/tmp/rspec.xml + expire_in: 7 days + when: always + +.parallel-qa-base: + parallel: 5 .allure-report-base: image: @@ -79,16 +66,6 @@ --ignore-missing-results \ --color -.knapsack-upload-base: - image: - name: ${QA_IMAGE} - entrypoint: [""] - stage: post-qa - before_script: - - cd qa - script: - - bundle exec rake 'knapsack:upload[knapsack/gcs/regenerated-*.json]' - review-qa-smoke: extends: - .review-qa-base @@ -96,8 +73,8 @@ review-qa-smoke: retry: 1 # This is confusing but this means "2 runs at max". variables: QA_RUN_TYPE: review-qa-smoke - script: - - bin/test Test::Instance::Smoke "${CI_ENVIRONMENT_URL}" + QA_SCENARIO: Test::Instance::Smoke + review-qa-reliable: extends: @@ -108,7 +85,6 @@ review-qa-reliable: variables: QA_RUN_TYPE: review-qa-reliable QA_SCENARIO: Test::Instance::Reliable - KNAPSACK_REPORT_PATH: knapsack/gcs/review-qa-reliable.json review-qa-all: extends: @@ -118,7 +94,6 @@ review-qa-all: variables: QA_RUN_TYPE: review-qa-all QA_SCENARIO: Test::Instance::All - KNAPSACK_REPORT_PATH: knapsack/gcs/review-qa-all.json review-performance: extends: @@ -155,6 +130,15 @@ allure-report-qa-smoke: ALLURE_REPORT_PATH_PREFIX: gitlab-review-smoke ALLURE_JOB_NAME: review-qa-smoke +allure-report-qa-reliable: + extends: + - .allure-report-base + - .review:rules:review-qa-reliable-report + needs: ["review-qa-reliable"] + variables: + ALLURE_REPORT_PATH_PREFIX: gitlab-review-reliable + ALLURE_JOB_NAME: review-qa-reliable + allure-report-qa-all: extends: - .allure-report-base @@ -164,18 +148,15 @@ allure-report-qa-all: ALLURE_REPORT_PATH_PREFIX: gitlab-review-all ALLURE_JOB_NAME: review-qa-all -knapsack-report-qa-all: +knapsack-report: extends: - - .knapsack-upload-base - - .review:rules:knapsack-report-qa-all - needs: ["review-qa-all"] - variables: - KNAPSACK_REPORT_PATH: knapsack/gcs/review-qa-all.json - -knapsack-report-qa-reliable: - extends: - - .knapsack-upload-base - - .review:rules:knapsack-report-qa-reliable - needs: ["review-qa-reliable"] - variables: - KNAPSACK_REPORT_PATH: knapsack/gcs/review-qa-reliable.json + - .review:rules:knapsack-report + image: + name: ${QA_IMAGE} + entrypoint: [""] + stage: post-qa + allow_failure: true + before_script: + - cd qa + script: + - bundle exec rake 'knapsack:upload[tmp/knapsack/*/*.json]' |