diff --git a/qa/Gemfile b/qa/Gemfile index a52385d314b..fb21f7c1ec6 100644 --- a/qa/Gemfile +++ b/qa/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'gitlab-qa', '~> 12', '>= 12.4.1', require: 'gitlab/qa' +gem 'gitlab-qa', '~> 12', '>= 12.4.1', git: 'https://gitlab.com/gitlab-org/gitlab-qa.git', branch: '16-5-stable' # rubocop:disable Cop/GemFetcher -- need to used a patched version of gitlab-qa so E2E tests pass in backports gem 'gitlab_quality-test_tooling', '~> 0.9.3', require: false gem 'gitlab-utils', path: '../gems/gitlab-utils' gem 'activesupport', '~> 7.0.8' # This should stay in sync with the root's Gemfile diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index 30fd3691521..6073ec95c09 100644 --- a/qa/Gemfile.lock +++ b/qa/Gemfile.lock @@ -1,3 +1,18 @@ +GIT + remote: https://gitlab.com/gitlab-org/gitlab-qa.git + revision: 1dc8493962f2fc91fe4a5daaf59b66593c4903f3 + branch: 16-5-stable + specs: + gitlab-qa (12.4.1) + activesupport (>= 6.1, < 7.1) + gitlab (~> 4.19) + http (~> 5.0) + nokogiri (~> 1.10) + parallel (>= 1, < 2) + rainbow (>= 3, < 4) + table_print (= 1.5.7) + zeitwerk (>= 2, < 3) + PATH remote: ../gems/gitlab-utils specs: @@ -121,15 +136,6 @@ GEM gitlab (4.19.0) httparty (~> 0.20) terminal-table (>= 1.5.1) - gitlab-qa (12.4.1) - activesupport (>= 6.1, < 7.1) - gitlab (~> 4.19) - http (~> 5.0) - nokogiri (~> 1.10) - parallel (>= 1, < 2) - rainbow (>= 3, < 4) - table_print (= 1.5.7) - zeitwerk (>= 2, < 3) gitlab_quality-test_tooling (0.9.3) activesupport (>= 6.1, < 7.1) gitlab (~> 4.19) @@ -351,7 +357,7 @@ DEPENDENCIES faraday-retry (~> 2.2) fog-core (= 2.1.0) fog-google (~> 1.19) - gitlab-qa (~> 12, >= 12.4.1) + gitlab-qa (~> 12, >= 12.4.1)! gitlab-utils! gitlab_quality-test_tooling (~> 0.9.3) influxdb-client (~> 2.9)