Add latest changes from gitlab-org/gitlab@master

5 files changed, 62 insertions, 9 deletions

diff --git a/doc/administration/terraform_state.md b/doc/administration/terraform_state.md
index 0c01279b04c..898d98495d9 100644
--- a/doc/administration/terraform_state.md
+++ b/doc/administration/terraform_state.md
@@ -4,7 +4,7 @@ group: Configure
 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/#assignments
 ---
 
-# Terraform state administration (alpha) **(FREE)**
+# Terraform state administration **(FREE)**
 
 > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2673) in GitLab 12.10.
 
diff --git a/doc/development/changelog.md b/doc/development/changelog.md
index eef18d6850d..f77f918d2a1 100644
--- a/doc/development/changelog.md
+++ b/doc/development/changelog.md
@@ -54,7 +54,7 @@ the `author` field. GitLab team members **should not**.
 - Any docs-only changes **should not** have a changelog entry.
 - Any change behind a feature flag **disabled** by default **should not** have a changelog entry.
 - Any change behind a feature flag that is **enabled** by default **should** have a changelog entry.
-- Any change that adds new Usage Data metrics and changes that needs to be documented in Product Intelligence [Metrics Dictionary](usage_ping/dictionary.md) **should** have a changelog entry.
+- Any change that adds new Usage Data metrics, sets the status of existing ones to `removed`, and changes that need to be documented in Product Intelligence [Metrics Dictionary](usage_ping/dictionary.md) **should** have a changelog entry.
 - A change that adds snowplow events **should** have a changelog entry -
 - A change that [removes a feature flag, or removes a feature and its feature flag](feature_flags/index.md) **must** have a changelog entry.
 - A fix for a regression introduced and then fixed in the same release (i.e.,
diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md
index 8a93a46247e..9b636260c13 100644
--- a/doc/development/pipelines.md
+++ b/doc/development/pipelines.md
@@ -424,6 +424,59 @@ This experiment is only enabled when the CI/CD variable `RSPEC_FAIL_FAST_ENABLED
 The test files related to the Merge Request are determined using the [`test_file_finder`](https://gitlab.com/gitlab-org/ci-cd/test_file_finder) gem.
 We are using a custom mapping between source file to test files, maintained in the `tests.yml` file.
 
+### RSpec minimal job experiment
+
+As part of the objective to improve overall pipeline duration, we are experimenting with a minimal set of RSpec tests.
+The purpose of this experiment is to verify if we are able to run a minimal set of RSpec tests in a Merge Request pipeline,
+without resulting in increased number of broken master.
+
+To identify the minimal set of tests needed, we use [Crystalball gem](https://github.com/toptal/crystalball) to create a test mapping.
+The test mapping contains a map of each source files to a list of test files which is dependent of the source file.
+This mapping is currently generated using a combination of test coverage tracing and a static mapping.
+In the `detect-tests` job, we use this mapping to identify the minimal tests needed for the current Merge Request.
+
+In this experiment, each `rspec` job is accompanied with a `minimal` version.
+For example, `rspec unit` job has a corresponding `rspec unit minimal` job. 
+During the experiment, each Merge Request pipeline will contain both versions of the job, running in parallel.
+
+To illustrate this:
+
+```mermaid
+graph LR
+    A --"artifact: list of test files"--> C1 & D1 & E1 & F1
+
+    subgraph "prepare stage";
+        A["detect-tests"];
+    end
+
+    subgraph "test stage";
+        C["rspec migration"];
+        C1["rspec migration minimal"];
+        D["rspec unit"];
+        D1["rspec unit minimal"];
+        E["rspec integration"];
+        E1["rspec integration minimal"];
+        F["rspec system"];
+        F1["rspec system minimal"];
+    end
+```
+
+The result of both set of jobs in the pipeline is then compared to identify any false positive.
+A list of such pipeline can be found in [Sisense](https://app.periscopedata.com/app/gitlab/496118/Engineering-Productivity-Sandbox?widget=10492739&udv=833427). 
+
+A false positive is defined as a pipeline where the `minimal` jobs passed, but the non-`minimal` jobs failed.
+This indicates that the changeset resulted in a test failure, which was not detected by the `minimal` jobs.
+Consequently, this signifies a gap in the test mapping used, which would need to be rectified.
+
+#### Findings
+
+After a round of the experiment done in December 2020,
+we discovered that it was challenging to achieve a mapping that gives high confidence at the moment,
+because of 2 reasons:
+
+- Each identified gap in the test mapping is unique, each needing its own investigation and improvement to the creation of the test mapping.
+- There is a large number of flaky tests which added a lot of noise in the data, slowing down the investigation process.
+
 ### PostgreSQL versions testing
 
 Even though [Omnibus defaults to PG12 for new installs and upgrades](https://docs.gitlab.com/omnibus/package-information/postgresql_versions.html),
diff --git a/doc/development/usage_ping/dictionary.md b/doc/development/usage_ping/dictionary.md
index 1f1e5225804..7c5d1c79d64 100644
--- a/doc/development/usage_ping/dictionary.md
+++ b/doc/development/usage_ping/dictionary.md
@@ -1300,7 +1300,7 @@ Count of groups with active integrations for HipChat
 
 Group: `group::ecosystem`
 
-Status: `data_available`
+Status: `removed`
 
 Tiers: `free`, `premium`, `ultimate`
 
@@ -1516,7 +1516,7 @@ Count of active groups inheriting integrations for HipChat
 
 Group: `group::ecosystem`
 
-Status: `data_available`
+Status: `removed`
 
 Tiers: `free`, `premium`, `ultimate`
 
@@ -2356,7 +2356,7 @@ Count of active instance-level integrations for HipChat
 
 Group: `group::ecosystem`
 
-Status: `data_available`
+Status: `removed`
 
 Tiers: `free`, `premium`, `ultimate`
 
@@ -3952,7 +3952,7 @@ Count of projects with active integrations for HipChat
 
 Group: `group::ecosystem`
 
-Status: `data_available`
+Status: `removed`
 
 Tiers: `free`, `premium`, `ultimate`
 
@@ -4180,7 +4180,7 @@ Count of active projects inheriting integrations for HipChat
 
 Group: `group::ecosystem`
 
-Status: `data_available`
+Status: `removed`
 
 Tiers: `free`, `premium`, `ultimate`
 
@@ -5632,7 +5632,7 @@ Count of active service templates for HipChat
 
 Group: `group::ecosystem`
 
-Status: `data_available`
+Status: `removed`
 
 Tiers: `free`, `premium`, `ultimate`
 
diff --git a/doc/user/project/time_tracking.md b/doc/user/project/time_tracking.md
index 78e7ded9784..402422cb3f3 100644
--- a/doc/user/project/time_tracking.md
+++ b/doc/user/project/time_tracking.md
@@ -98,4 +98,4 @@ With this option enabled, `75h` is displayed instead of `1w 4d 3h`.
 
 ## Other interesting links
 
-- [Time Tracking landing page in the GitLab handbook](https://about.gitlab.com/solutions/time-tracking/)
+- [Time Tracking solutions page](https://about.gitlab.com/solutions/time-tracking/)