Showing content from https://gitlab.com/gitlab-org/gitlab-qa/-/merge_requests/243.patch below:
From a5b9af3ac96062fba8bd446061cb63652cd3b6a4 Mon Sep 17 00:00:00 2001 From: Tanya Pazitny Date: Fri, 24 May 2019 08:22:03 -0700 Subject: [PATCH 1/4] Add onprem testbed configuration --- docs/what_tests_can_be_run.md | 6 ++- lib/gitlab/qa.rb | 1 + lib/gitlab/qa/component/onprem.rb | 13 +++++++ .../qa/scenario/test/instance/onprem.rb | 37 +++++++++++++++++++ 4 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 lib/gitlab/qa/component/onprem.rb create mode 100644 lib/gitlab/qa/scenario/test/instance/onprem.rb diff --git a/docs/what_tests_can_be_run.md b/docs/what_tests_can_be_run.md index b7dc50d34..578d9f8d9 100644 --- a/docs/what_tests_can_be_run.md +++ b/docs/what_tests_can_be_run.md @@ -448,8 +448,10 @@ to the canary fleet. This scenario functions the same as `Test::Instance::Staging` but will run tests against [`pre.gitlab.com`](https://pre.gitlab.com). -Note that [`pre.gitlab.com`](https://pre.gitlab.com) is used as an Interim -Performance Testbed and [will be replaced with the actual testbed in the future](https://gitlab.com/groups/gitlab-com/gl-infra/-/epics/60). +### `Test::Instance::Onprem` + +This scenario functions the same as `Test::Instance::Staging` +but will run tests against [`onprem.testbed.gitlab.net`](https://onprem.testbed.gitlab.net), which has replaced preprod as [the performance testbed](https://gitlab.com/groups/gitlab-com/gl-infra/-/epics/60). ### `Test::Instance::Smoke` diff --git a/lib/gitlab/qa.rb b/lib/gitlab/qa.rb index e8ce29a7e..40ebd7a97 100644 --- a/lib/gitlab/qa.rb +++ b/lib/gitlab/qa.rb @@ -21,6 +21,7 @@ module Gitlab autoload :Production, 'gitlab/qa/scenario/test/instance/production' autoload :Smoke, 'gitlab/qa/scenario/test/instance/smoke' autoload :Preprod, 'gitlab/qa/scenario/test/instance/preprod' + autoload :Onprem, 'qa/scenario/test/instance/onprem' end module Omnibus diff --git a/lib/gitlab/qa/component/onprem.rb b/lib/gitlab/qa/component/onprem.rb new file mode 100644 index 000000000..852ec3903 --- /dev/null +++ b/lib/gitlab/qa/component/onprem.rb @@ -0,0 +1,13 @@ +require 'net/http' +require 'json' +require 'uri' + +module Gitlab + module QA + module Component + class Onprem < Staging + ADDRESS = 'https://onprem.testbed.gitlab.net'.freeze + end + end + end +end diff --git a/lib/gitlab/qa/scenario/test/instance/onprem.rb b/lib/gitlab/qa/scenario/test/instance/onprem.rb new file mode 100644 index 000000000..2856f7ba8 --- /dev/null +++ b/lib/gitlab/qa/scenario/test/instance/onprem.rb @@ -0,0 +1,37 @@ +module Gitlab + module QA + module Scenario + module Test + module Instance + ## + # Run test suite against pre.gitlab.com + # + class Onprem < Scenario::Template + def perform(*rspec_args) + Runtime::Env.require_no_license! + + release = Component::Onprem.release + + if release.dev_gitlab_org? + Docker::Command.execute( + [ + 'login', + '--username gitlab-qa-bot', + %(--password "#{Runtime::Env.dev_access_token_variable}"), + Release::DEV_REGISTRY + ] + ) + end + + Component::Specs.perform do |specs| + specs.suite = 'Test::Instance::All' + specs.release = release + specs.args = [Component::Onprem::ADDRESS, *rspec_args] + end + end + end + end + end + end + end +end -- GitLab From 84e7c2743772f3e9c02f048faa788b9d5e5dc4e8 Mon Sep 17 00:00:00 2001 From: Tanya Pazitny Date: Sun, 26 May 2019 22:07:44 +0000 Subject: [PATCH 2/4] Apply suggestion to lib/gitlab/qa/scenario/test/instance/onprem.rb --- lib/gitlab/qa/scenario/test/instance/onprem.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/qa/scenario/test/instance/onprem.rb b/lib/gitlab/qa/scenario/test/instance/onprem.rb index 2856f7ba8..0c80d319d 100644 --- a/lib/gitlab/qa/scenario/test/instance/onprem.rb +++ b/lib/gitlab/qa/scenario/test/instance/onprem.rb @@ -4,7 +4,7 @@ module Gitlab module Test module Instance ## - # Run test suite against pre.gitlab.com + # Run test suite against onprem.testbed.gitlab.net # class Onprem < Scenario::Template def perform(*rspec_args) -- GitLab From f1aa2742c33b5a05e1af19d1022ee1ece48b6434 Mon Sep 17 00:00:00 2001 From: Tanya Pazitny Date: Thu, 25 Jul 2019 21:50:57 +0000 Subject: [PATCH 3/4] Apply suggestion to lib/gitlab/qa/scenario/test/instance/onprem.rb --- .../qa/scenario/test/instance/onprem.rb | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/lib/gitlab/qa/scenario/test/instance/onprem.rb b/lib/gitlab/qa/scenario/test/instance/onprem.rb index 0c80d319d..0a6f40c5e 100644 --- a/lib/gitlab/qa/scenario/test/instance/onprem.rb +++ b/lib/gitlab/qa/scenario/test/instance/onprem.rb @@ -6,28 +6,9 @@ module Gitlab ## # Run test suite against onprem.testbed.gitlab.net # - class Onprem < Scenario::Template - def perform(*rspec_args) - Runtime::Env.require_no_license! - - release = Component::Onprem.release - - if release.dev_gitlab_org? - Docker::Command.execute( - [ - 'login', - '--username gitlab-qa-bot', - %(--password "#{Runtime::Env.dev_access_token_variable}"), - Release::DEV_REGISTRY - ] - ) - end - - Component::Specs.perform do |specs| - specs.suite = 'Test::Instance::All' - specs.release = release - specs.args = [Component::Onprem::ADDRESS, *rspec_args] - end + class Onprem < DeploymentBase + def deployment_component + Component::Onprem end end end -- GitLab From 3d3456300c01b390e8a3c7796d633f82225ad675 Mon Sep 17 00:00:00 2001 From: Tanya Pazitny Date: Fri, 26 Jul 2019 06:32:12 -0700 Subject: [PATCH 4/4] Add and fix onprem autoloads --- lib/gitlab/qa.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/gitlab/qa.rb b/lib/gitlab/qa.rb index 40ebd7a97..fa49d59be 100644 --- a/lib/gitlab/qa.rb +++ b/lib/gitlab/qa.rb @@ -21,7 +21,7 @@ module Gitlab autoload :Production, 'gitlab/qa/scenario/test/instance/production' autoload :Smoke, 'gitlab/qa/scenario/test/instance/smoke' autoload :Preprod, 'gitlab/qa/scenario/test/instance/preprod' - autoload :Onprem, 'qa/scenario/test/instance/onprem' + autoload :Onprem, 'gitlab/qa/scenario/test/instance/onprem' end module Omnibus @@ -62,6 +62,7 @@ module Gitlab autoload :Minio, 'gitlab/qa/component/minio' autoload :Preprod, 'gitlab/qa/component/preprod' autoload :Elasticsearch, 'gitlab/qa/component/elasticsearch' + autoload :Onprem, 'gitlab/qa/component/onprem' end module Docker -- GitLab
RetroSearch is an open source project built by @garambo
| Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4