Skip to content
代码片段 群组 项目
提交 781ffa92 编辑于 作者: Dan Davison's avatar Dan Davison
浏览文件

Merge branch 'filter-external-calls-package-e2e' into 'master'

Filter external calls package e2e

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127318



Merged-by: default avatarDan Davison <ddavison@gitlab.com>
Approved-by: default avatarDan Davison <ddavison@gitlab.com>
Reviewed-by: default avatarDan Davison <ddavison@gitlab.com>
Co-authored-by: default avatarSofia Vistas <svistas@gitlab.com>
No related branches found
No related tags found
无相关合并请求
显示
19 个添加15 个删除
...@@ -15,6 +15,7 @@ This is a partial list of the [RSpec metadata](https://rspec.info/features/3-12/ ...@@ -15,6 +15,7 @@ This is a partial list of the [RSpec metadata](https://rspec.info/features/3-12/
|-----------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| |-----------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `:elasticsearch` | The test requires an Elasticsearch service. It is used by the [instance-level scenario](https://gitlab.com/gitlab-org/gitlab-qa#definitions) [`Test::Integration::Elasticsearch`](https://gitlab.com/gitlab-org/gitlab/-/blob/72b62b51bdf513e2936301cb6c7c91ec27c35b4d/qa/qa/ee/scenario/test/integration/elasticsearch.rb) to include only tests that require Elasticsearch. | | `:elasticsearch` | The test requires an Elasticsearch service. It is used by the [instance-level scenario](https://gitlab.com/gitlab-org/gitlab-qa#definitions) [`Test::Integration::Elasticsearch`](https://gitlab.com/gitlab-org/gitlab/-/blob/72b62b51bdf513e2936301cb6c7c91ec27c35b4d/qa/qa/ee/scenario/test/integration/elasticsearch.rb) to include only tests that require Elasticsearch. |
| `:except` | The test is to be run in their typical execution contexts _except_ as specified. See [test execution context selection](execution_context_selection.md) for more information. | | `:except` | The test is to be run in their typical execution contexts _except_ as specified. See [test execution context selection](execution_context_selection.md) for more information. |
| `:external_api_calls` | The test requires interaction with a network external to the Docker network |
| `:feature_flag` | The test uses a feature flag and therefore requires an administrator account to run. When `scope` is set to `:global`, the test will be skipped on all live .com environments. Otherwise, it will be skipped only on Canary, Production, and Pre-production. See [testing with feature flags](../../../development/testing_guide/end_to_end/feature_flags.md) for more details. | | `:feature_flag` | The test uses a feature flag and therefore requires an administrator account to run. When `scope` is set to `:global`, the test will be skipped on all live .com environments. Otherwise, it will be skipped only on Canary, Production, and Pre-production. See [testing with feature flags](../../../development/testing_guide/end_to_end/feature_flags.md) for more details. |
| `:framework` | The test makes sanity assertions around the QA framework itself | | `:framework` | The test makes sanity assertions around the QA framework itself |
| `:geo` | The test requires two GitLab Geo instances - a primary and a secondary - to be spun up. | | `:geo` | The test requires two GitLab Geo instances - a primary and a secondary - to be spun up. |
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
module QA module QA
RSpec.describe 'Package', :object_storage, product_group: :package_registry do RSpec.describe 'Package', :object_storage, product_group: :package_registry do
describe 'Composer Repository' do describe 'Composer Repository', :external_api_calls do
include Runtime::Fixtures include Runtime::Fixtures
let(:project) do let(:project) do
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe 'Package', :object_storage, product_group: :package_registry, quarantine: { RSpec.describe 'Package', :object_storage, :external_api_calls, product_group: :package_registry, quarantine: {
only: { job: %w[object_storage airgapped], condition: -> { QA::Support::FIPS.enabled? } }, only: { job: 'object_storage', condition: -> { QA::Support::FIPS.enabled? } },
issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/417584', issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/417584',
type: :bug type: :bug
} do } do
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
module QA module QA
RSpec.describe 'Package', :object_storage, product_group: :package_registry do RSpec.describe 'Package', :object_storage, product_group: :package_registry do
describe 'Generic Repository', except: { job: 'airgapped' } do describe 'Generic Repository', :external_api_calls do
include Runtime::Fixtures include Runtime::Fixtures
let(:project) do let(:project) do
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
module QA module QA
RSpec.describe 'Package', :object_storage, product_group: :package_registry do RSpec.describe 'Package', :object_storage, product_group: :package_registry do
describe 'Helm Registry', except: { job: 'airgapped' } do describe 'Helm Registry', :external_api_calls do
using RSpec::Parameterized::TableSyntax using RSpec::Parameterized::TableSyntax
include Runtime::Fixtures include Runtime::Fixtures
include Support::Helpers::MaskToken include Support::Helpers::MaskToken
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
module QA module QA
RSpec.describe 'Package', :object_storage, product_group: :package_registry do RSpec.describe 'Package', :object_storage, product_group: :package_registry do
describe 'Maven group level endpoint', except: { job: 'airgapped' } do describe 'Maven group level endpoint', :external_api_calls do
include Runtime::Fixtures include Runtime::Fixtures
include Support::Helpers::MaskToken include Support::Helpers::MaskToken
include_context 'packages registry qa scenario' include_context 'packages registry qa scenario'
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe 'Package', :object_storage, except: { job: 'airgapped' } do RSpec.describe 'Package', :object_storage, :external_api_calls do
describe 'Maven project level endpoint', product_group: :package_registry do describe 'Maven project level endpoint', product_group: :package_registry do
include Runtime::Fixtures include Runtime::Fixtures
include Support::Helpers::MaskToken include Support::Helpers::MaskToken
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe 'Package', :object_storage, RSpec.describe 'Package', :object_storage, :external_api_calls,
quarantine: { quarantine: {
only: { condition: -> { QA::Support::FIPS.enabled? } }, only: { condition: -> { QA::Support::FIPS.enabled? } },
issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/417600', issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/417600',
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
module QA module QA
RSpec.describe 'Package' do RSpec.describe 'Package' do
describe 'npm Registry group level endpoint', :object_storage, product_group: :package_registry do describe 'npm Registry group level endpoint', :object_storage, :external_api_calls,
product_group: :package_registry do
using RSpec::Parameterized::TableSyntax using RSpec::Parameterized::TableSyntax
include Runtime::Fixtures include Runtime::Fixtures
include Support::Helpers::MaskToken include Support::Helpers::MaskToken
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
module QA module QA
RSpec.describe 'Package' do RSpec.describe 'Package' do
describe 'npm Registry instance level endpoint', :object_storage, product_group: :package_registry do describe 'npm Registry instance level endpoint', :object_storage, :external_api_calls,
product_group: :package_registry do
using RSpec::Parameterized::TableSyntax using RSpec::Parameterized::TableSyntax
include Runtime::Fixtures include Runtime::Fixtures
include Support::Helpers::MaskToken include Support::Helpers::MaskToken
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
module QA module QA
RSpec.describe 'Package' do RSpec.describe 'Package' do
describe 'npm Registry project level endpoint', :object_storage, product_group: :package_registry do describe 'npm Registry project level endpoint', :object_storage, :external_api_calls,
product_group: :package_registry do
using RSpec::Parameterized::TableSyntax using RSpec::Parameterized::TableSyntax
include Runtime::Fixtures include Runtime::Fixtures
include Support::Helpers::MaskToken include Support::Helpers::MaskToken
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
module QA module QA
RSpec.describe 'Package', :object_storage, product_group: :package_registry do RSpec.describe 'Package', :object_storage, product_group: :package_registry do
describe 'NuGet group level endpoint' do describe 'NuGet group level endpoint', :external_api_calls do
using RSpec::Parameterized::TableSyntax using RSpec::Parameterized::TableSyntax
include Runtime::Fixtures include Runtime::Fixtures
include Support::Helpers::MaskToken include Support::Helpers::MaskToken
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
module QA module QA
RSpec.describe 'Package', :object_storage, product_group: :package_registry do RSpec.describe 'Package', :object_storage, product_group: :package_registry do
describe 'NuGet project level endpoint' do describe 'NuGet project level endpoint', :external_api_calls do
include Support::Helpers::MaskToken include Support::Helpers::MaskToken
let(:project) do let(:project) do
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
module QA module QA
RSpec.describe 'Package', :object_storage, product_group: :package_registry do RSpec.describe 'Package', :object_storage, product_group: :package_registry do
describe 'PyPI Repository', except: { job: 'airgapped' } do describe 'PyPI Repository', :external_api_calls do
include Runtime::Fixtures include Runtime::Fixtures
include Support::Helpers::MaskToken include Support::Helpers::MaskToken
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe 'Package', :object_storage, RSpec.describe 'Package', :object_storage, :external_api_calls,
feature_flag: { name: 'rubygem_packages', scope: :project } do feature_flag: { name: 'rubygem_packages', scope: :project } do
describe 'RubyGems Repository', product_group: :package_registry do describe 'RubyGems Repository', product_group: :package_registry do
include Runtime::Fixtures include Runtime::Fixtures
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册