Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
937b3143d4
commit
fe96527139
|
@ -351,7 +351,6 @@ RSpec/LeakyConstantDeclaration:
|
||||||
- 'spec/db/schema_spec.rb'
|
- 'spec/db/schema_spec.rb'
|
||||||
- 'spec/lib/feature_spec.rb'
|
- 'spec/lib/feature_spec.rb'
|
||||||
- 'spec/lib/gitlab/config/entry/simplifiable_spec.rb'
|
- 'spec/lib/gitlab/config/entry/simplifiable_spec.rb'
|
||||||
- 'spec/lib/gitlab/import_export/import_test_coverage_spec.rb'
|
|
||||||
- 'spec/lib/gitlab/quick_actions/dsl_spec.rb'
|
- 'spec/lib/gitlab/quick_actions/dsl_spec.rb'
|
||||||
- 'spec/lib/marginalia_spec.rb'
|
- 'spec/lib/marginalia_spec.rb'
|
||||||
- 'spec/mailers/notify_spec.rb'
|
- 'spec/mailers/notify_spec.rb'
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Fix leaky constant issue in test coverage spec
|
||||||
|
merge_request: 32134
|
||||||
|
author: Rajendra Kadam
|
||||||
|
type: fixed
|
|
@ -1,3 +1,9 @@
|
||||||
|
---
|
||||||
|
stage: Package
|
||||||
|
group: Package
|
||||||
|
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
|
||||||
|
---
|
||||||
|
|
||||||
# GitLab Container Registry administration
|
# GitLab Container Registry administration
|
||||||
|
|
||||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/4040) in GitLab 8.8.
|
> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/4040) in GitLab 8.8.
|
||||||
|
|
|
@ -1,3 +1,9 @@
|
||||||
|
---
|
||||||
|
stage: Package
|
||||||
|
group: Package
|
||||||
|
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
|
||||||
|
---
|
||||||
|
|
||||||
# GitLab Dependency Proxy administration **(PREMIUM ONLY)**
|
# GitLab Dependency Proxy administration **(PREMIUM ONLY)**
|
||||||
|
|
||||||
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/7934) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.11.
|
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/7934) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.11.
|
||||||
|
|
|
@ -1,3 +1,9 @@
|
||||||
|
---
|
||||||
|
stage: Package
|
||||||
|
group: Package
|
||||||
|
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
|
||||||
|
---
|
||||||
|
|
||||||
# GitLab Package Registry administration **(PREMIUM ONLY)**
|
# GitLab Package Registry administration **(PREMIUM ONLY)**
|
||||||
|
|
||||||
GitLab Packages allows organizations to utilize GitLab as a private repository
|
GitLab Packages allows organizations to utilize GitLab as a private repository
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
---
|
---
|
||||||
|
stage: Release
|
||||||
|
group: Release Management
|
||||||
|
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
|
||||||
description: 'Learn how to administer GitLab Pages.'
|
description: 'Learn how to administer GitLab Pages.'
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,9 @@
|
||||||
|
---
|
||||||
|
stage: Release
|
||||||
|
group: Release Management
|
||||||
|
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
|
||||||
|
---
|
||||||
|
|
||||||
# GitLab Pages administration for source installations
|
# GitLab Pages administration for source installations
|
||||||
|
|
||||||
>**Note:**
|
>**Note:**
|
||||||
|
|
|
@ -103,9 +103,6 @@ Registry, and scans the containers:
|
||||||
variables:
|
variables:
|
||||||
DOCKER_DRIVER: overlay2
|
DOCKER_DRIVER: overlay2
|
||||||
|
|
||||||
services:
|
|
||||||
- docker:19.03.8-dind
|
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- build
|
- build
|
||||||
- test
|
- test
|
||||||
|
@ -113,6 +110,8 @@ stages:
|
||||||
build:
|
build:
|
||||||
image: docker:stable
|
image: docker:stable
|
||||||
stage: build
|
stage: build
|
||||||
|
services:
|
||||||
|
- docker:19.03.8-dind
|
||||||
variables:
|
variables:
|
||||||
IMAGE: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
|
IMAGE: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
|
||||||
script:
|
script:
|
||||||
|
@ -274,14 +273,13 @@ this with a pipeline means you won't have to do it manually each time. You can u
|
||||||
```yaml
|
```yaml
|
||||||
image: docker:stable
|
image: docker:stable
|
||||||
|
|
||||||
services:
|
|
||||||
- docker:19.03.8-dind
|
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- build
|
- build
|
||||||
|
|
||||||
build_latest_vulnerabilities:
|
build_latest_vulnerabilities:
|
||||||
stage: build
|
stage: build
|
||||||
|
services:
|
||||||
|
- docker:19.03.8-dind
|
||||||
script:
|
script:
|
||||||
- docker pull arminc/clair-db:latest
|
- docker pull arminc/clair-db:latest
|
||||||
- docker tag arminc/clair-db:latest $CI_REGISTRY/namespace/clair-vulnerabilities-db
|
- docker tag arminc/clair-db:latest $CI_REGISTRY/namespace/clair-vulnerabilities-db
|
||||||
|
|
|
@ -10,12 +10,13 @@ require 'spec_helper'
|
||||||
describe 'Test coverage of the Project Import' do
|
describe 'Test coverage of the Project Import' do
|
||||||
include ConfigurationHelper
|
include ConfigurationHelper
|
||||||
|
|
||||||
# `MUTED_RELATIONS` is a technical debt.
|
# `muted_relations` is a technical debt.
|
||||||
# This list expected to be empty or used as a workround
|
# This list expected to be empty or used as a workround
|
||||||
# in case this spec blocks an important urgent MR.
|
# in case this spec blocks an important urgent MR.
|
||||||
# It is also expected that adding a relation in the list should lead to
|
# It is also expected that adding a relation in the list should lead to
|
||||||
# opening a follow-up issue to fix this.
|
# opening a follow-up issue to fix this.
|
||||||
MUTED_RELATIONS = %w[
|
let(:muted_relations) do
|
||||||
|
%w[
|
||||||
project.milestones.events.push_event_payload
|
project.milestones.events.push_event_payload
|
||||||
project.issues.events
|
project.issues.events
|
||||||
project.issues.events.push_event_payload
|
project.issues.events.push_event_payload
|
||||||
|
@ -51,20 +52,23 @@ describe 'Test coverage of the Project Import' do
|
||||||
project.boards.lists.label.priorities
|
project.boards.lists.label.priorities
|
||||||
project.service_desk_setting
|
project.service_desk_setting
|
||||||
].freeze
|
].freeze
|
||||||
|
end
|
||||||
|
|
||||||
# A list of JSON fixture files we use to test Import.
|
# A list of JSON fixture files we use to test Import.
|
||||||
# Most of the relations are present in `complex/project.json`
|
# Most of the relations are present in `complex/project.json`
|
||||||
# which is our main fixture.
|
# which is our main fixture.
|
||||||
PROJECT_JSON_FIXTURES = [
|
let(:project_json_fixtures) do
|
||||||
|
[
|
||||||
'spec/fixtures/lib/gitlab/import_export/complex/project.json',
|
'spec/fixtures/lib/gitlab/import_export/complex/project.json',
|
||||||
'spec/fixtures/lib/gitlab/import_export/group/project.json',
|
'spec/fixtures/lib/gitlab/import_export/group/project.json',
|
||||||
'spec/fixtures/lib/gitlab/import_export/light/project.json',
|
'spec/fixtures/lib/gitlab/import_export/light/project.json',
|
||||||
'spec/fixtures/lib/gitlab/import_export/milestone-iid/project.json',
|
'spec/fixtures/lib/gitlab/import_export/milestone-iid/project.json',
|
||||||
'spec/fixtures/lib/gitlab/import_export/designs/project.json'
|
'spec/fixtures/lib/gitlab/import_export/designs/project.json'
|
||||||
].freeze
|
].freeze
|
||||||
|
end
|
||||||
|
|
||||||
it 'ensures that all imported/exported relations are present in test JSONs' do
|
it 'ensures that all imported/exported relations are present in test JSONs' do
|
||||||
not_tested_relations = (relations_from_config - tested_relations) - MUTED_RELATIONS
|
not_tested_relations = (relations_from_config - tested_relations) - muted_relations
|
||||||
|
|
||||||
expect(not_tested_relations).to be_empty, failure_message(not_tested_relations)
|
expect(not_tested_relations).to be_empty, failure_message(not_tested_relations)
|
||||||
end
|
end
|
||||||
|
@ -76,7 +80,7 @@ describe 'Test coverage of the Project Import' do
|
||||||
end
|
end
|
||||||
|
|
||||||
def tested_relations
|
def tested_relations
|
||||||
PROJECT_JSON_FIXTURES.flat_map(&method(:relations_from_json)).to_set
|
project_json_fixtures.flat_map(&method(:relations_from_json)).to_set
|
||||||
end
|
end
|
||||||
|
|
||||||
def relations_from_json(json_file)
|
def relations_from_json(json_file)
|
||||||
|
@ -106,7 +110,7 @@ describe 'Test coverage of the Project Import' do
|
||||||
These relations seem to be added recenty and
|
These relations seem to be added recenty and
|
||||||
they expected to be covered in our Import specs: #{not_tested_relations}.
|
they expected to be covered in our Import specs: #{not_tested_relations}.
|
||||||
|
|
||||||
To do that, expand one of the files listed in `PROJECT_JSON_FIXTURES`
|
To do that, expand one of the files listed in `project_json_fixtures`
|
||||||
(or expand the list if you consider adding a new fixture file).
|
(or expand the list if you consider adding a new fixture file).
|
||||||
|
|
||||||
After that, add a new spec into
|
After that, add a new spec into
|
||||||
|
@ -114,7 +118,7 @@ describe 'Test coverage of the Project Import' do
|
||||||
to check that the relation is being imported correctly.
|
to check that the relation is being imported correctly.
|
||||||
|
|
||||||
In case the spec breaks the master or there is a sense of urgency,
|
In case the spec breaks the master or there is a sense of urgency,
|
||||||
you could include the relations into the `MUTED_RELATIONS` list.
|
you could include the relations into the `muted_relations` list.
|
||||||
|
|
||||||
Muting relations is considered to be a temporary solution, so please
|
Muting relations is considered to be a temporary solution, so please
|
||||||
open a follow-up issue and try to fix that when it is possible.
|
open a follow-up issue and try to fix that when it is possible.
|
||||||
|
|
Loading…
Reference in New Issue