diff options
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 29 | ||||
| -rw-r--r-- | qa/qa/resource/sandbox.rb | 8 |
2 files changed, 33 insertions, 4 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index ce019de213b..6f420be275f 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -159,13 +159,23 @@ review-stop: - echo "${QA_IMAGE}" - source scripts/utils.sh - install_api_client_dependencies_with_apk - - gem install gitlab-qa --no-document ${GITLAB_QA_VERSION:+ --version ${GITLAB_QA_VERSION}} + - apk add --update git + - git clone https://gitlab.com/gitlab-org/gitlab-qa.git + - cd gitlab-qa + - gem build gitlab-qa + - gem install gitlab-qa review-qa-smoke: <<: *review-qa-base script: - gitlab-qa Test::Instance::Smoke "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}" +review-qa-smoke-parallel: + <<: *review-qa-base + allow_failure: true + script: + - gitlab-qa Test::Instance::Smoke "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}" --parallel + review-qa-all: <<: *review-qa-base allow_failure: true @@ -176,6 +186,23 @@ review-qa-all: - export KNAPSACK_TEST_FILE_PATTERN=qa/specs/features/**/*_spec.rb - gitlab-qa Test::Instance::Any "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}" +review-qa-all-parallel: + <<: *review-qa-base + allow_failure: true + when: manual + script: + - gitlab-qa Test::Instance::Any "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}" --parallel + +review-qa-all-knapsack-parallel: + <<: *review-qa-base + allow_failure: true + when: manual + parallel: 5 + script: + - export KNAPSACK_REPORT_PATH=knapsack/${CI_PROJECT_NAME}/review-qa-all_master_report.json + - export KNAPSACK_TEST_FILE_PATTERN=qa/specs/features/**/*_spec.rb + - gitlab-qa Test::Instance::Any "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}" --parallel + .review-performance-base: &review-performance-base <<: *review-qa-base allow_failure: true diff --git a/qa/qa/resource/sandbox.rb b/qa/qa/resource/sandbox.rb index e2b1c4c0831..2141af64929 100644 --- a/qa/qa/resource/sandbox.rb +++ b/qa/qa/resource/sandbox.rb @@ -35,9 +35,11 @@ module QA end def fabricate_via_api! - resource_web_url(api_get) - rescue ResourceNotFoundError - super + QA::Support::Retrier.retry_on_exception do + resource_web_url(api_get) + rescue ResourceNotFoundError + super + end end def api_get_path |