diff options
Diffstat (limited to '.gitlab/ci/review-apps/qa.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/review-apps/qa.gitlab-ci.yml | 47 |
1 files changed, 43 insertions, 4 deletions
diff --git a/.gitlab/ci/review-apps/qa.gitlab-ci.yml b/.gitlab/ci/review-apps/qa.gitlab-ci.yml index 07f8bd4e5fd..af4674b802b 100644 --- a/.gitlab/ci/review-apps/qa.gitlab-ci.yml +++ b/.gitlab/ci/review-apps/qa.gitlab-ci.yml @@ -16,16 +16,19 @@ GITLAB_ADMIN_PASSWORD: "${REVIEW_APPS_ROOT_PASSWORD}" GITLAB_QA_ADMIN_ACCESS_TOKEN: "${REVIEW_APPS_ROOT_TOKEN}" GITHUB_ACCESS_TOKEN: "${REVIEW_APPS_QA_GITHUB_ACCESS_TOKEN}" - EE_LICENSE: "${REVIEW_APPS_EE_LICENSE}" SIGNUP_DISABLED: "true" before_script: # Use $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA so that GitLab image built in omnibus-gitlab-mirror and QA image are in sync. + - export EE_LICENSE="$(cat $REVIEW_APPS_EE_LICENSE_FILE)" - if [ -n "$CI_MERGE_REQUEST_SOURCE_BRANCH_SHA" ]; then git checkout -f ${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}; fi - 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 @@ -34,21 +37,28 @@ .parallel-qa-base: parallel: 5 + variables: + KNAPSACK_TEST_FILE_PATTERN: "qa/specs/features/**/*_spec.rb" script: - - export KNAPSACK_REPORT_PATH=knapsack/master_report.json - - export KNAPSACK_TEST_FILE_PATTERN=qa/specs/features/**/*_spec.rb - | 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 reports: junit: qa/tmp/rspec.xml .allure-report-base: image: - name: ${GITLAB_DEPENDENCY_PROXY}andrcuns/allure-report-publisher:0.4.1 + name: ${GITLAB_DEPENDENCY_PROXY}andrcuns/allure-report-publisher:0.4.2 entrypoint: [""] stage: post-qa variables: @@ -69,6 +79,16 @@ --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 @@ -84,9 +104,11 @@ review-qa-reliable: - .review-qa-base - .review:rules:review-qa-reliable - .parallel-qa-base + retry: 1 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: @@ -96,6 +118,7 @@ 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: @@ -140,3 +163,19 @@ allure-report-qa-all: variables: ALLURE_REPORT_PATH_PREFIX: gitlab-review-all ALLURE_JOB_NAME: review-qa-all + +knapsack-report-qa-all: + 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 |