Merge branch 'gy-rename-browser-performance-widget' into 'master'

Rename Browser Performance Testing in code

Closes #220181

See merge request gitlab-org/gitlab!34634

app/models/ci/job_artifact.rb

@@ -34,6 +34,7 @@ module Ci
       license_management: 'gl-license-management-report.json',
       license_scanning: 'gl-license-scanning-report.json',
       performance: 'performance.json',
+      browser_performance: 'browser-performance.json',
       metrics: 'metrics.txt',
       lsif: 'lsif.json',
       dotenv: '.env',
@@ -73,6 +74,7 @@ module Ci
       license_management: :raw,
       license_scanning: :raw,
       performance: :raw,
+      browser_performance: :raw,
       terraform: :raw,
       requirements: :raw,
       coverage_fuzzing: :raw
@@ -93,6 +95,7 @@ module Ci
       lsif
       metrics
       performance
+      browser_performance
       sast
       secret_detection
       requirements
@@ -180,7 +183,7 @@ module Ci
       codequality: 9, ## EE-specific
       license_management: 10, ## EE-specific
       license_scanning: 101, ## EE-specific till 13.0
-      performance: 11, ## EE-specific
+      performance: 11, ## EE-specific till 13.2
       metrics: 12, ## EE-specific
       metrics_referee: 13, ## runner referees
       network_referee: 14, ## runner referees
@@ -192,7 +195,8 @@ module Ci
       cluster_applications: 20,
       secret_detection: 21, ## EE-specific
       requirements: 22, ## EE-specific
-      coverage_fuzzing: 23 ## EE-specific
+      coverage_fuzzing: 23, ## EE-specific
+      browser_performance: 24 ## EE-specific
     }
 
     enum file_format: {

db/migrate/20200707094341_add_browser_performance_to_plan_limits.rb

+# frozen_string_literal: true
+
+class AddBrowserPerformanceToPlanLimits < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    add_column :plan_limits, "ci_max_artifact_size_browser_performance", :integer, default: 0, null: false
+  end
+end

db/structure.sql

@@ -13814,7 +13814,8 @@ CREATE TABLE public.plan_limits (
     ci_max_artifact_size_cluster_applications integer DEFAULT 0 NOT NULL,
     ci_max_artifact_size_secret_detection integer DEFAULT 0 NOT NULL,
     ci_max_artifact_size_requirements integer DEFAULT 0 NOT NULL,
-    ci_max_artifact_size_coverage_fuzzing integer DEFAULT 0 NOT NULL
+    ci_max_artifact_size_coverage_fuzzing integer DEFAULT 0 NOT NULL,
+    ci_max_artifact_size_browser_performance integer DEFAULT 0 NOT NULL
 );
 
 CREATE SEQUENCE public.plan_limits_id_seq
@@ -23643,5 +23644,6 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200706005325
 20200706170536
 20200707071941
+20200707094341
 \.
 

doc/ci/pipelines/job_artifacts.md

@@ -251,10 +251,10 @@ dashboards.
 > - Introduced in GitLab 11.5.
 > - Requires GitLab Runner 11.5 and above.
 
-The `performance` report collects [Performance metrics](../../user/project/merge_requests/browser_performance_testing.md)
+The `performance` report collects [Browser Performance Testing metrics](../../user/project/merge_requests/browser_performance_testing.md)
 as artifacts.
 
-The collected Performance report will be uploaded to GitLab as an artifact and will
+The collected Browser Performance report will be uploaded to GitLab as an artifact and will
 be automatically shown in merge requests.
 
 #### `artifacts:reports:metrics` **(PREMIUM)**

doc/ci/yaml/README.md

@@ -117,7 +117,7 @@ The following table lists available parameters for jobs:
 | [`when`](#when)                                    | When to run job. Also available: `when:manual` and `when:delayed`.                                                                                                                  |
 | [`environment`](#environment)                      | Name of an environment to which the job deploys. Also available: `environment:name`, `environment:url`, `environment:on_stop`, `environment:auto_stop_in` and `environment:action`. |
 | [`cache`](#cache)                                  | List of files that should be cached between subsequent runs. Also available: `cache:paths`, `cache:key`, `cache:untracked`, and `cache:policy`.                                     |
-| [`artifacts`](#artifacts)                          | List of files and directories to attach to a job on success. Also available: `artifacts:paths`, `artifacts:exclude`, `artifacts:expose_as`, `artifacts:name`, `artifacts:untracked`, `artifacts:when`, `artifacts:expire_in`, `artifacts:reports`, `artifacts:reports:junit`, `artifacts:reports:cobertura`, and `artifacts:reports:terraform`.<br><br>In GitLab [Enterprise Edition](https://about.gitlab.com/pricing/), these are available: `artifacts:reports:codequality`, `artifacts:reports:sast`, `artifacts:reports:dependency_scanning`, `artifacts:reports:container_scanning`, `artifacts:reports:dast`, `artifacts:reports:license_scanning`, `artifacts:reports:license_management` (removed in GitLab 13.0),`artifacts:reports:performance` and `artifacts:reports:metrics`. |
+| [`artifacts`](#artifacts)                          | List of files and directories to attach to a job on success. Also available: `artifacts:paths`, `artifacts:exclude`, `artifacts:expose_as`, `artifacts:name`, `artifacts:untracked`, `artifacts:when`, `artifacts:expire_in`, `artifacts:reports`, `artifacts:reports:junit`, `artifacts:reports:cobertura`, and `artifacts:reports:terraform`.<br><br>In GitLab [Enterprise Edition](https://about.gitlab.com/pricing/), these are available: `artifacts:reports:codequality`, `artifacts:reports:sast`, `artifacts:reports:dependency_scanning`, `artifacts:reports:container_scanning`, `artifacts:reports:dast`, `artifacts:reports:license_scanning`, `artifacts:reports:license_management` (removed in GitLab 13.0), `artifacts:reports:performance` and `artifacts:reports:metrics`. |
 | [`dependencies`](#dependencies)                    | Restrict which artifacts are passed to a specific job by providing a list of jobs to fetch artifacts from.                                                                          |
 | [`coverage`](#coverage)                            | Code coverage settings for a given job.                                                                                                                                             |
 | [`retry`](#retry)                                  | When and how many times a job can be auto-retried in case of a failure.                                                                                                             |
@@ -3148,7 +3148,7 @@ These are the available report types:
 | [`artifacts:reports:dast`](../pipelines/job_artifacts.md#artifactsreportsdast-ultimate) **(ULTIMATE)**                               | The `dast` report collects Dynamic Application Security Testing vulnerabilities. |
 | [`artifacts:reports:license_management`](../pipelines/job_artifacts.md#artifactsreportslicense_management-ultimate) **(ULTIMATE)**   | The `license_management` report collects Licenses (*removed from GitLab 13.0*).  |
 | [`artifacts:reports:license_scanning`](../pipelines/job_artifacts.md#artifactsreportslicense_scanning-ultimate) **(ULTIMATE)**       | The `license_scanning` report collects Licenses.                                 |
-| [`artifacts:reports:performance`](../pipelines/job_artifacts.md#artifactsreportsperformance-premium) **(PREMIUM)**                   | The `performance` report collects Performance metrics.                           |
+| [`artifacts:reports:performance`](../pipelines/job_artifacts.md#artifactsreportsperformance-premium) **(PREMIUM)**   | The `performance` report collects Browser Performance metrics.                   |
 | [`artifacts:reports:metrics`](../pipelines/job_artifacts.md#artifactsreportsmetrics-premium) **(PREMIUM)**                           | The `metrics` report collects Metrics.                                           |
 
 #### `dependencies`

ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue

@@ -14,7 +14,6 @@ import MrWidgetApprovals from './components/approvals/approvals.vue';
 import MrWidgetGeoSecondaryNode from './components/states/mr_widget_secondary_geo_node.vue';
 import MergeTrainHelperText from './components/merge_train_helper_text.vue';
 import { MTWPS_MERGE_STRATEGY } from '~/vue_merge_request_widget/constants';
-import { TOTAL_SCORE_METRIC_NAME } from 'ee/vue_merge_request_widget/stores/constants';
 
 export default {
   components: {
@@ -33,9 +32,9 @@ export default {
   data() {
     return {
       isLoadingCodequality: false,
-      isLoadingPerformance: false,
+      isLoadingBrowserPerformance: false,
       loadingCodequalityFailed: false,
-      loadingPerformanceFailed: false,
+      loadingBrowserPerformanceFailed: false,
       loadingLicenseReportFailed: false,
     };
   },
@@ -59,36 +58,36 @@ export default {
             this.mr.codeclimateMetrics.resolvedIssues.length > 0))
       );
     },
-    hasPerformanceMetrics() {
+    hasBrowserPerformanceMetrics() {
       return (
-        this.mr.performanceMetrics &&
-        ((this.mr.performanceMetrics.degraded && this.mr.performanceMetrics.degraded.length > 0) ||
-          (this.mr.performanceMetrics.improved && this.mr.performanceMetrics.improved.length > 0))
+        this.mr.browserPerformanceMetrics?.degraded?.length > 0 ||
+        this.mr.browserPerformanceMetrics?.improved?.length > 0 ||
+        this.mr.browserPerformanceMetrics?.same?.length > 0
       );
     },
-    hasPerformancePaths() {
-      const { performance } = this.mr || {};
+    hasBrowserPerformancePaths() {
+      const browserPerformance = this.mr?.browserPerformance || {};
 
-      return Boolean(performance?.head_path && performance?.base_path);
+      return Boolean(browserPerformance?.head_path && browserPerformance?.base_path);
     },
-    degradedTotalScore() {
-      return this.mr?.performanceMetrics?.degraded.find(
-        metric => metric.name === TOTAL_SCORE_METRIC_NAME,
+    degradedBrowserPerformanceTotalScore() {
+      return this.mr?.browserPerformanceMetrics?.degraded.find(
+        metric => metric.name === __('Total Score'),
       );
     },
-    hasPerformanceDegradation() {
-      const threshold = this.mr?.performance?.degradation_threshold || 0;
+    hasBrowserPerformanceDegradation() {
+      const threshold = this.mr?.browserPerformance?.degradation_threshold || 0;
 
       if (!threshold) {
         return true;
       }
 
-      const totalScoreDelta = this.degradedTotalScore?.delta || 0;
+      const totalScoreDelta = this.degradedBrowserPerformanceTotalScore?.delta || 0;
 
       return threshold + totalScoreDelta <= 0;
     },
-    shouldRenderPerformance() {
-      return this.hasPerformancePaths && this.hasPerformanceDegradation;
+    shouldRenderBrowserPerformance() {
+      return this.hasBrowserPerformancePaths && this.hasBrowserPerformanceDegradation;
     },
     shouldRenderSecurityReport() {
       const { enabledReports } = this.mr;
@@ -139,37 +138,40 @@ export default {
       return {};
     },
 
-    performanceText() {
-      const { improved, degraded } = this.mr.performanceMetrics;
+    browserPerformanceText() {
+      const { improved, degraded, same } = this.mr.browserPerformanceMetrics;
       const text = [];
-
-      if (!improved.length && !degraded.length) {
-        text.push(s__('ciReport|No changes to performance metrics'));
-      } else if (improved.length || degraded.length) {
-        text.push(s__('ciReport|Performance metrics'));
-
-        if (improved.length) {
-          text.push(n__(' improved on %d point', ' improved on %d points', improved.length));
-        }
-
-        if (improved.length > 0 && degraded.length > 0) {
-          text.push(__(' and'));
-        }
-
-        if (degraded.length) {
-          text.push(n__(' degraded on %d point', ' degraded on %d points', degraded.length));
-        }
+      const reportNumbers = [];
+
+      if (improved.length || degraded.length || same.length) {
+        text.push(s__('ciReport|Browser performance test metrics: '));
+
+        if (degraded.length > 0)
+          reportNumbers.push(
+            sprintf(s__('ciReport|%{degradedNum} degraded'), { degradedNum: degraded.length }),
+          );
+        if (same.length > 0)
+          reportNumbers.push(sprintf(s__('ciReport|%{sameNum} same'), { sameNum: same.length }));
+        if (improved.length > 0)
+          reportNumbers.push(
+            sprintf(s__('ciReport|%{improvedNum} improved'), { improvedNum: improved.length }),
+          );
+      } else {
+        text.push(s__('ciReport|Browser performance test metrics: No changes'));
       }
 
-      return text.join('');
+      return [...text, ...reportNumbers.join(', ')].join('');
     },
 
     codequalityStatus() {
       return this.checkReportStatus(this.isLoadingCodequality, this.loadingCodequalityFailed);
     },
 
-    performanceStatus() {
-      return this.checkReportStatus(this.isLoadingPerformance, this.loadingPerformanceFailed);
+    browserPerformanceStatus() {
+      return this.checkReportStatus(
+        this.isLoadingBrowserPerformance,
+        this.loadingBrowserPerformanceFailed,
+      );
     },
 
     shouldRenderMergeTrainHelperText() {
@@ -191,9 +193,9 @@ export default {
         this.fetchCodeQuality();
       }
     },
-    hasPerformancePaths(newVal) {
+    hasBrowserPerformancePaths(newVal) {
       if (newVal) {
-        this.fetchPerformance();
+        this.fetchBrowserPerformance();
       }
     },
   },
@@ -241,19 +243,20 @@ export default {
         });
     },
 
-    fetchPerformance() {
-      const { head_path, base_path } = this.mr.performance;
+    fetchBrowserPerformance() {
+      const { head_path, base_path } = this.mr.browserPerformance;
 
-      this.isLoadingPerformance = true;
+      this.isLoadingBrowserPerformance = true;
 
       Promise.all([this.service.fetchReport(head_path), this.service.fetchReport(base_path)])
         .then(values => {
-          this.mr.comparePerformanceMetrics(values[0], values[1]);
-          this.isLoadingPerformance = false;
+          this.mr.compareBrowserPerformanceMetrics(values[0], values[1]);
         })
         .catch(() => {
-          this.isLoadingPerformance = false;
-          this.loadingPerformanceFailed = true;
+          this.loadingBrowserPerformanceFailed = true;
+        })
+        .finally(() => {
+          this.isLoadingBrowserPerformance = false;
         });
     },
 
@@ -308,16 +311,17 @@ export default {
         class="js-codequality-widget mr-widget-border-top mr-report"
       />
       <report-section
-        v-if="shouldRenderPerformance"
-        :status="performanceStatus"
-        :loading-text="translateText('performance').loading"
-        :error-text="translateText('performance').error"
-        :success-text="performanceText"
-        :unresolved-issues="mr.performanceMetrics.degraded"
-        :resolved-issues="mr.performanceMetrics.improved"
-        :has-issues="hasPerformanceMetrics"
+        v-if="shouldRenderBrowserPerformance"
+        :status="browserPerformanceStatus"
+        :loading-text="translateText('browser-performance').loading"
+        :error-text="translateText('browser-performance').error"
+        :success-text="browserPerformanceText"
+        :unresolved-issues="mr.browserPerformanceMetrics.degraded"
+        :resolved-issues="mr.browserPerformanceMetrics.improved"
+        :neutral-issues="mr.browserPerformanceMetrics.same"
+        :has-issues="hasBrowserPerformanceMetrics"
         :component="$options.componentNames.PerformanceIssueBody"
-        class="js-performance-widget mr-widget-border-top mr-report"
+        class="js-browser-performance-widget mr-widget-border-top mr-report"
       />
       <grouped-metrics-reports-app
         v-if="mr.metricsReportsPath"

ee/app/assets/javascripts/vue_merge_request_widget/stores/constants.js

-/* eslint-disable import/prefer-default-export */
-
-// This is the name of Sitespeed's Overall Score metric in the performance report
-export const TOTAL_SCORE_METRIC_NAME = 'Total Score';

ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js

@@ -29,7 +29,7 @@ export default class MergeRequestStore extends CEMergeRequestStore {
     this.appUrl = gon && gon.gitlab_url;
 
     this.initCodeclimate(data);
-    this.initPerformanceReport(data);
+    this.initBrowserPerformanceReport(data);
     this.licenseScanning = data.license_scanning;
     this.metricsReportsPath = data.metrics_reports_path;
 
@@ -85,11 +85,12 @@ export default class MergeRequestStore extends CEMergeRequestStore {
     };
   }
 
-  initPerformanceReport(data) {
-    this.performance = data.performance;
-    this.performanceMetrics = {
+  initBrowserPerformanceReport(data) {
+    this.browserPerformance = data.browser_performance;
+    this.browserPerformanceMetrics = {
       improved: [],
       degraded: [],
+      same: [],
     };
   }
 
@@ -119,11 +120,12 @@ export default class MergeRequestStore extends CEMergeRequestStore {
     );
   }
 
-  comparePerformanceMetrics(headMetrics, baseMetrics) {
-    const headMetricsIndexed = MergeRequestStore.normalizePerformanceMetrics(headMetrics);
-    const baseMetricsIndexed = MergeRequestStore.normalizePerformanceMetrics(baseMetrics);
+  compareBrowserPerformanceMetrics(headMetrics, baseMetrics) {
+    const headMetricsIndexed = MergeRequestStore.normalizeBrowserPerformanceMetrics(headMetrics);
+    const baseMetricsIndexed = MergeRequestStore.normalizeBrowserPerformanceMetrics(baseMetrics);
     const improved = [];
     const degraded = [];
+    const same = [];
 
     Object.keys(headMetricsIndexed).forEach(subject => {
       const subjectMetrics = headMetricsIndexed[subject];
@@ -150,18 +152,20 @@ export default class MergeRequestStore extends CEMergeRequestStore {
             } else {
               degraded.push(metricData);
             }
+          } else {
+            same.push(metricData);
           }
         }
       });
     });
 
-    this.performanceMetrics = { improved, degraded };
+    this.browserPerformanceMetrics = { improved, degraded, same };
   }
 
-  // normalize performance metrics by indexing on performance subject and metric name
-  static normalizePerformanceMetrics(performanceData) {
+  // normalize browser performance metrics by indexing on performance subject and metric name
+  static normalizeBrowserPerformanceMetrics(browserPerformanceData) {
     const indexedSubjects = {};
-    performanceData.forEach(({ subject, metrics }) => {
+    browserPerformanceData.forEach(({ subject, metrics }) => {
       const indexedMetrics = {};
       metrics.forEach(({ name, ...data }) => {
         indexedMetrics[name] = data;

ee/app/models/ee/ci/job_artifact.rb

@@ -21,6 +21,7 @@ module EE
       DAST_REPORT_TYPES = %w[dast].freeze
       REQUIREMENTS_REPORT_FILE_TYPES = %w[requirements].freeze
       COVERAGE_FUZZING_REPORT_TYPES = %w[coverage_fuzzing].freeze
+      BROWSER_PERFORMANCE_REPORT_FILE_TYPES = %w[browser_performance performance].freeze
 
       scope :project_id_in, ->(ids) { where(project_id: ids) }
       scope :with_files_stored_remotely, -> { where(file_store: ::JobArtifactUploader::Store::REMOTE) }
@@ -64,6 +65,7 @@ module EE
       def self.associated_file_types_for(file_type)
         return unless file_types.include?(file_type)
         return LICENSE_SCANNING_REPORT_FILE_TYPES if LICENSE_SCANNING_REPORT_FILE_TYPES.include?(file_type)
+        return BROWSER_PERFORMANCE_REPORT_FILE_TYPES if BROWSER_PERFORMANCE_REPORT_FILE_TYPES.include?(file_type)
 
         [file_type]
       end

ee/app/models/ee/ci/pipeline.rb

@@ -45,6 +45,7 @@ module EE
           container_scanning: %i[container_scanning],
           dast: %i[dast],
           performance: %i[merge_request_performance_metrics],
+          browser_performance: %i[merge_request_performance_metrics],
           license_management: %i[license_scanning],
           license_scanning: %i[license_scanning],
           metrics: %i[metrics_reports],

ee/app/presenters/ee/ci/pipeline_presenter.rb

@@ -34,13 +34,13 @@ module EE
           download_project_job_artifacts_path(
             job_artifact.project,
             job_artifact.job,
-            file_type: file_type,
+            file_type: job_artifact.file_type,
             proxy: true)
         end
       end
 
-      def degradation_threshold
-        if (job_artifact = batch_lookup_report_artifact_for_file_type(:performance)) &&
+      def degradation_threshold(file_type)
+        if (job_artifact = batch_lookup_report_artifact_for_file_type(file_type)) &&
             can?(current_user, :read_build, job_artifact.job)
           job_artifact.job.degradation_threshold
         end

ee/app/serializers/ee/merge_request_widget_entity.rb

@@ -26,18 +26,18 @@ module EE
         end
       end
 
-      expose :performance, if: -> (mr, _) { head_pipeline_downloadable_path_for_report_type(:performance) } do
+      expose :browser_performance, if: -> (mr, _) { head_pipeline_downloadable_path_for_report_type(:browser_performance) } do
         expose :degradation_threshold do |merge_request|
           merge_request.head_pipeline&.present(current_user: current_user)
-            &.degradation_threshold
+            &.degradation_threshold(:browser_performance)
         end
 
         expose :head_path do |merge_request|
-          head_pipeline_downloadable_path_for_report_type(:performance)
+          head_pipeline_downloadable_path_for_report_type(:browser_performance)
         end
 
         expose :base_path do |merge_request|
-          base_pipeline_downloadable_path_for_report_type(:performance)
+          base_pipeline_downloadable_path_for_report_type(:browser_performance)
         end
       end
 

ee/changelogs/unreleased/gy-rename-browser-performance-widget.yml

+---
+title: Renamed Browser Performance Testing feature to be clearer, CI report now also
+  shows unchanged values
+merge_request: 34634
+author:
+type: changed

ee/spec/factories/ci/builds.rb

@@ -6,7 +6,7 @@ FactoryBot.define do
       failure_reason { Ci::Build.failure_reasons[:protected_environment_failure] }
     end
 
-    %i[codequality container_scanning dast dependency_scanning license_management license_scanning performance sast secret_detection].each do |report_type|
+    %i[codequality container_scanning dast dependency_scanning license_management license_scanning performance browser_performance sast secret_detection].each do |report_type|
       trait "legacy_#{report_type}".to_sym do
         success
         artifacts

ee/spec/factories/ci/job_artifacts.rb

@@ -221,6 +221,16 @@ FactoryBot.define do
       end
     end
 
+    trait :browser_performance do
+      file_format { :raw }
+      file_type { :browser_performance }
+
+      after(:build) do |artifact, _|
+        artifact.file = fixture_file_upload(
+          Rails.root.join('spec/fixtures/trace/sample_trace'), 'text/plain')
+      end
+    end
+
     trait :dependency_scanning do
       file_format { :raw }
       file_type { :dependency_scanning }

ee/spec/factories/ci/pipelines.rb

@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :ee_ci_pipeline, class: 'Ci::Pipeline', parent: :ci_pipeline do
-    %i[container_scanning dast dependency_list dependency_scanning license_management license_scanning sast secret_detection coverage_fuzzing].each do |report_type|
+    %i[browser_performance codequality container_scanning coverage_fuzzing dast dependency_list dependency_scanning license_management license_scanning sast secret_detection].each do |report_type|
       trait "with_#{report_type}_report".to_sym do
         status { :success }
 

ee/spec/frontend/vue_mr_widget/ee_mr_widget_options_spec.js

@@ -11,8 +11,8 @@ import { trimText } from 'helpers/text_helper';
 import mockData, {
   baseIssues,
   headIssues,
-  basePerformance,
-  headPerformance,
+  baseBrowserPerformance,
+  headBrowserPerformance,
   parsedBaseIssues,
   parsedHeadIssues,
 } from './mock_data';
@@ -40,7 +40,7 @@ describe('ee merge request widget options', () => {
   let mock;
   let Component;
 
-  const DEFAULT_PERFORMANCE = {
+  const DEFAULT_BROWSER_PERFORMANCE = {
     head_path: 'head.json',
     base_path: 'base.json',
   };
@@ -70,13 +70,13 @@ describe('ee merge request widget options', () => {
     });
   });
 
-  const findPerformanceWidget = () => vm.$el.querySelector('.js-performance-widget');
+  const findBrowserPerformanceWidget = () => vm.$el.querySelector('.js-browser-performance-widget');
   const findSecurityWidget = () => vm.$el.querySelector('.js-security-widget');
 
-  const setPerformance = (data = {}) => {
-    const performance = { ...DEFAULT_PERFORMANCE, ...data };
-    gl.mrWidgetData.performance = performance;
-    vm.mr.performance = performance;
+  const setBrowserPerformance = (data = {}) => {
+    const browserPerformance = { ...DEFAULT_BROWSER_PERFORMANCE, ...data };
+    gl.mrWidgetData.browserPerformance = browserPerformance;
+    vm.mr.browserPerformance = browserPerformance;
   };
 
   const VULNERABILITY_FEEDBACK_ENDPOINT = 'vulnerability_feedback_path';
@@ -485,25 +485,25 @@ describe('ee merge request widget options', () => {
     });
   });
 
-  describe('performance', () => {
+  describe('browser_performance', () => {
     beforeEach(() => {
       gl.mrWidgetData = {
         ...mockData,
-        performance: {},
+        browserPerformance: {},
       };
     });
 
     describe('when it is loading', () => {
       it('should render loading indicator', done => {
-        mock.onGet('head.json').reply(200, headPerformance);
-        mock.onGet('base.json').reply(200, basePerformance);
+        mock.onGet('head.json').reply(200, headBrowserPerformance);
+        mock.onGet('base.json').reply(200, baseBrowserPerformance);
         vm = mountComponent(Component, { mrData: gl.mrWidgetData });
 
-        vm.mr.performance = { ...DEFAULT_PERFORMANCE };
+        vm.mr.browserPerformance = { ...DEFAULT_BROWSER_PERFORMANCE };
 
         vm.$nextTick(() => {
-          expect(trimText(findPerformanceWidget().textContent)).toContain(
-            'Loading performance report',
+          expect(trimText(findBrowserPerformanceWidget().textContent)).toContain(
+            'Loading browser-performance report',
           );
 
           done();
@@ -513,21 +513,23 @@ describe('ee merge request widget options', () => {
 
     describe('with successful request', () => {
       beforeEach(() => {
-        mock.onGet(DEFAULT_PERFORMANCE.head_path).reply(200, headPerformance);
-        mock.onGet(DEFAULT_PERFORMANCE.base_path).reply(200, basePerformance);
+        mock.onGet(DEFAULT_BROWSER_PERFORMANCE.head_path).reply(200, headBrowserPerformance);
+        mock.onGet(DEFAULT_BROWSER_PERFORMANCE.base_path).reply(200, baseBrowserPerformance);
         vm = mountComponent(Component, { mrData: gl.mrWidgetData });
       });
 
       describe('default', () => {
         beforeEach(() => {
-          setPerformance();
+          setBrowserPerformance();
         });
 
         it('should render provided data', done => {
           setImmediate(() => {
             expect(
-              trimText(vm.$el.querySelector('.js-performance-widget .js-code-text').textContent),
-            ).toEqual('Performance metrics improved on 2 points and degraded on 1 point');
+              trimText(
+                vm.$el.querySelector('.js-browser-performance-widget .js-code-text').textContent,
+              ),
+            ).toEqual('Browser performance test metrics: 2 degraded, 1 same, 1 improved');
             done();
           });
         });
@@ -535,14 +537,16 @@ describe('ee merge request widget options', () => {
         describe('text connector', () => {
           it('should only render information about fixed issues', done => {
             setImmediate(() => {
-              vm.mr.performanceMetrics.degraded = [];
+              vm.mr.browserPerformanceMetrics.degraded = [];
+              vm.mr.browserPerformanceMetrics.same = [];
 
               Vue.nextTick(() => {
                 expect(
                   trimText(
-                    vm.$el.querySelector('.js-performance-widget .js-code-text').textContent,
+                    vm.$el.querySelector('.js-browser-performance-widget .js-code-text')
+                      .textContent,
                   ),
-                ).toEqual('Performance metrics improved on 2 points');
+                ).toEqual('Browser performance test metrics: 1 improved');
                 done();
               });
             });
@@ -550,14 +554,16 @@ describe('ee merge request widget options', () => {
 
           it('should only render information about added issues', done => {
             setImmediate(() => {
-              vm.mr.performanceMetrics.improved = [];
+              vm.mr.browserPerformanceMetrics.improved = [];
+              vm.mr.browserPerformanceMetrics.same = [];
 
               Vue.nextTick(() => {
                 expect(
                   trimText(
-                    vm.$el.querySelector('.js-performance-widget .js-code-text').textContent,
+                    vm.$el.querySelector('.js-browser-performance-widget .js-code-text')
+                      .textContent,
                   ),
-                ).toEqual('Performance metrics degraded on 1 point');
+                ).toEqual('Browser performance test metrics: 2 degraded');
                 done();
               });
             });
@@ -573,18 +579,18 @@ describe('ee merge request widget options', () => {
         'with degradation_threshold = $degradation_threshold',
         ({ degradation_threshold, shouldExist }) => {
           beforeEach(() => {
-            setPerformance({ degradation_threshold });
+            setBrowserPerformance({ degradation_threshold });
 
             return waitForPromises();
           });
 
           if (shouldExist) {
             it('should render widget when total score degradation is above threshold', () => {
-              expect(findPerformanceWidget()).toExist();
+              expect(findBrowserPerformanceWidget()).toExist();
             });
           } else {
             it('should not render widget when total score degradation is below threshold', () => {
-              expect(findPerformanceWidget()).not.toExist();
+              expect(findBrowserPerformanceWidget()).not.toExist();
             });
           }
         },
@@ -593,12 +599,12 @@ describe('ee merge request widget options', () => {
 
     describe('with empty successful request', () => {
       beforeEach(done => {
-        mock.onGet(DEFAULT_PERFORMANCE.head_path).reply(200, []);
-        mock.onGet(DEFAULT_PERFORMANCE.base_path).reply(200, []);
+        mock.onGet(DEFAULT_BROWSER_PERFORMANCE.head_path).reply(200, []);
+        mock.onGet(DEFAULT_BROWSER_PERFORMANCE.base_path).reply(200, []);
         vm = mountComponent(Component, { mrData: gl.mrWidgetData });
 
-        gl.mrWidgetData.performance = { ...DEFAULT_PERFORMANCE };
-        vm.mr.performance = gl.mrWidgetData.performance;
+        gl.mrWidgetData.browserPerformance = { ...DEFAULT_BROWSER_PERFORMANCE };
+        vm.mr.browserPerformance = gl.mrWidgetData.browserPerformance;
 
         // wait for network request from component watch update method
         setImmediate(done);
@@ -606,38 +612,44 @@ describe('ee merge request widget options', () => {
 
       it('should render provided data', () => {
         expect(
-          trimText(vm.$el.querySelector('.js-performance-widget .js-code-text').textContent),
-        ).toEqual('No changes to performance metrics');
+          trimText(
+            vm.$el.querySelector('.js-browser-performance-widget .js-code-text').textContent,
+          ),
+        ).toEqual('Browser performance test metrics: No changes');
       });
 
       it('does not show Expand button', () => {
-        const expandButton = vm.$el.querySelector('.js-performance-widget .js-collapse-btn');
+        const expandButton = vm.$el.querySelector(
+          '.js-browser-performance-widget .js-collapse-btn',
+        );
 
         expect(expandButton).toBeNull();
       });
 
       it('shows success icon', () => {
         expect(
-          vm.$el.querySelector('.js-performance-widget .js-ci-status-icon-success'),
+          vm.$el.querySelector('.js-browser-performance-widget .js-ci-status-icon-success'),
         ).not.toBeNull();
       });
     });
 
     describe('with failed request', () => {
       beforeEach(() => {
-        mock.onGet(DEFAULT_PERFORMANCE.head_path).reply(500, []);
-        mock.onGet(DEFAULT_PERFORMANCE.base_path).reply(500, []);
+        mock.onGet(DEFAULT_BROWSER_PERFORMANCE.head_path).reply(500, []);
+        mock.onGet(DEFAULT_BROWSER_PERFORMANCE.base_path).reply(500, []);
         vm = mountComponent(Component, { mrData: gl.mrWidgetData });
 
-        gl.mrWidgetData.performance = { ...DEFAULT_PERFORMANCE };
-        vm.mr.performance = gl.mrWidgetData.performance;
+        gl.mrWidgetData.browserPerformance = { ...DEFAULT_BROWSER_PERFORMANCE };
+        vm.mr.browserPerformance = gl.mrWidgetData.browserPerformance;
       });
 
       it('should render error indicator', done => {
         setImmediate(() => {
           expect(
-            trimText(vm.$el.querySelector('.js-performance-widget .js-code-text').textContent),
-          ).toContain('Failed to load performance report');
+            trimText(
+              vm.$el.querySelector('.js-browser-performance-widget .js-code-text').textContent,
+            ),
+          ).toContain('Failed to load browser-performance report');
           done();
         });
       });

ee/spec/frontend/vue_mr_widget/mock_data.js

@@ -99,63 +99,56 @@ export const parsedBaseIssues = [
   },
 ];
 
-export const headPerformance = [
+export const headBrowserPerformance = [
   {
     subject: '/some/path',
-    metrics: [
-      {
-        name: 'Sitespeed Score',
-        value: 85,
-      },
-    ],
-  },
-  {
-    subject: '/some/other/path',
     metrics: [
       {
         name: 'Total Score',
-        value: 79,
+        value: 80,
         desiredSize: 'larger',
       },
       {
         name: 'Requests',
-        value: 3,
+        value: 30,
         desiredSize: 'smaller',
       },
-    ],
-  },
-  {
-    subject: '/yet/another/path',
-    metrics: [
       {
-        name: 'Sitespeed Score',
-        value: 80,
+        name: 'Speed Index',
+        value: 1155,
+        desiredSize: 'smaller',
+      },
+      {
+        name: 'Transfer Size (KB)',
+        value: '1070.1',
+        desiredSize: 'smaller',
       },
     ],
   },
 ];
 
-export const basePerformance = [
+export const baseBrowserPerformance = [
   {
     subject: '/some/path',
-    metrics: [
-      {
-        name: 'Sitespeed Score',
-        value: 84,
-      },
-    ],
-  },
-  {
-    subject: '/some/other/path',
     metrics: [
       {
         name: 'Total Score',
-        value: 80,
+        value: 82,
         desiredSize: 'larger',
       },
       {
         name: 'Requests',
-        value: 4,
+        value: 30,
+        desiredSize: 'smaller',
+      },
+      {
+        name: 'Speed Index',
+        value: 1165,
+        desiredSize: 'smaller',
+      },
+      {
+        name: 'Transfer Size (KB)',
+        value: '1065.1',
         desiredSize: 'smaller',
       },
     ],

spec/lib/gitlab/ci/templates/Jobs/browser_performance_testing_gitlab_ci_yaml_spec.rb → ee/spec/lib/gitlab/ci/templates/Jobs/browser_performance_testing_gitlab_ci_yaml_spec.rb

@@ -43,7 +43,7 @@ RSpec.describe 'Jobs/Browser-Performance-Testing.gitlab-ci.yml' do
       expect(pipeline.errors).to be_empty
     end
 
-    shared_examples_for 'performance job on tag or branch' do
+    shared_examples_for 'browser_performance job on tag or branch' do
       it 'by default' do
         expect(build_names).to include('performance')
       end
@@ -56,19 +56,19 @@ RSpec.describe 'Jobs/Browser-Performance-Testing.gitlab-ci.yml' do
     end
 
     context 'on master' do
-      it_behaves_like 'performance job on tag or branch'
+      it_behaves_like 'browser_performance job on tag or branch'
     end
 
     context 'on another branch' do
       let(:pipeline_ref) { 'feature' }
 
-      it_behaves_like 'performance job on tag or branch'
+      it_behaves_like 'browser_performance job on tag or branch'
     end
 
     context 'on tag' do
       let(:pipeline_ref) { 'v1.0.0' }
 
-      it_behaves_like 'performance job on tag or branch'
+      it_behaves_like 'browser_performance job on tag or branch'
     end
 
     context 'on merge request' do

ee/spec/lib/gitlab/ci/templates/Verify/browser_performance_testing_gitlab_ci_yaml_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Verify/Browser-Performance.gitlab-ci.yml' do
+  subject(:template) do
+    <<~YAML
+      stages:
+        - test
+        - performance
+
+      include:
+        - template: 'Verify/Browser-Performance.gitlab-ci.yml'
+
+      placeholder:
+        script:
+          - keep pipeline validator happy by having a job when stages are intentionally empty
+    YAML
+  end
+
+  describe 'the created pipeline' do
+    let(:user) { create(:admin) }
+    let(:project) { create(:project, :repository) }
+
+    let(:default_branch) { 'master' }
+    let(:pipeline_ref) { default_branch }
+    let(:service) { Ci::CreatePipelineService.new(project, user, ref: pipeline_ref) }
+    let(:pipeline) { service.execute!(:push) }
+    let(:build_names) { pipeline.builds.pluck(:name) }
+
+    before do
+      stub_ci_pipeline_yaml_file(template)
+
+      allow_any_instance_of(Ci::BuildScheduleWorker).to receive(:perform).and_return(true)
+      allow(project).to receive(:default_branch).and_return(default_branch)
+    end
+
+    it 'has no errors' do
+      expect(pipeline.errors).to be_empty
+    end
+
+    shared_examples_for 'browser_performance job on tag or branch' do
+      it 'by default' do
+        expect(build_names).to include('performance')
+      end
+    end
+
+    context 'on master' do
+      it_behaves_like 'browser_performance job on tag or branch'
+    end
+
+    context 'on another branch' do
+      let(:pipeline_ref) { 'feature' }
+
+      it_behaves_like 'browser_performance job on tag or branch'
+    end
+
+    context 'on tag' do
+      let(:pipeline_ref) { 'v1.0.0' }
+
+      it_behaves_like 'browser_performance job on tag or branch'
+    end
+
+    context 'on merge request' do
+      let(:service) { MergeRequests::CreatePipelineService.new(project, user) }
+      let(:merge_request) { create(:merge_request, :simple, source_project: project) }
+      let(:pipeline) { service.execute(merge_request) }
+
+      it 'has no jobs' do
+        expect(pipeline).to be_merge_request_event
+        expect(build_names).to be_empty
+      end
+    end
+  end
+end

ee/spec/models/ci/pipeline_spec.rb

@@ -63,55 +63,44 @@ RSpec.describe Ci::Pipeline do
   end
 
   describe '#batch_lookup_report_artifact_for_file_type' do
-    subject(:artifact) { pipeline.batch_lookup_report_artifact_for_file_type(file_type) }
-
-    let(:build_artifact) { build.job_artifacts.sample }
-
-    context 'with security report artifact' do
-      let!(:build) { create(:ee_ci_build, :dependency_scanning, :success, pipeline: pipeline) }
-      let(:file_type) { :dependency_scanning }
-
-      before do
-        stub_licensed_features(dependency_scanning: true)
-      end
+    shared_examples '#batch_lookup_report_artifact_for_file_type' do |file_type, license|
+      context 'when feature is available' do
+        before do
+          stub_licensed_features("#{license}": true)
+        end
 
-      it 'returns right kind of artifacts' do
-        is_expected.to eq(build_artifact)
+        it "returns the #{file_type} artifact" do
+          expect(pipeline.batch_lookup_report_artifact_for_file_type(file_type)).to eq(pipeline.job_artifacts.sample)
+        end
       end
 
-      context 'when looking for other type of artifact' do
-        let(:file_type) { :codequality }
+      context 'when feature is not available' do
+        before do
+          stub_licensed_features("#{license}": false)
+        end
 
-        it 'returns nothing' do
-          is_expected.to be_nil
+        it "doesn't return the #{file_type} artifact" do
+          expect(pipeline.batch_lookup_report_artifact_for_file_type(file_type)).to be_nil
         end
       end
     end
 
-    context 'with license compliance artifact' do
-      before do
-        stub_licensed_features(license_scanning: true)
-      end
+    context 'with security report artifact' do
+      let_it_be(:pipeline, reload: true) { create(:ee_ci_pipeline, :with_dependency_scanning_report, project: project) }
 
-      [:license_management, :license_scanning].each do |artifact_type|
-        let!(:build) { create(:ee_ci_build, artifact_type, :success, pipeline: pipeline) }
+      include_examples '#batch_lookup_report_artifact_for_file_type', :dependency_scanning, :dependency_scanning
+    end
 
-        context 'when looking for license_scanning' do
-          let(:file_type) { :license_scanning }
+    context 'with license scanning artifact' do
+      let_it_be(:pipeline, reload: true) { create(:ee_ci_pipeline, :with_license_scanning_report, project: project) }
 
-          it 'returns artifact' do
-            is_expected.to eq(build_artifact)
-          end
-        end
+      include_examples '#batch_lookup_report_artifact_for_file_type', :license_scanning, :license_scanning
+    end
 
-        context 'when looking for license_management' do
-          let(:file_type) { :license_management }
+    context 'with browser performance artifact' do
+      let_it_be(:pipeline, reload: true) { create(:ee_ci_pipeline, :with_browser_performance_report, project: project) }
 
-          it 'returns artifact' do
-            is_expected.to eq(build_artifact)
-          end
-        end
-      end
+      include_examples '#batch_lookup_report_artifact_for_file_type', :browser_performance, :merge_request_performance_metrics
     end
   end
 

ee/spec/models/ee/ci/job_artifact_spec.rb

@@ -91,9 +91,10 @@ RSpec.describe EE::Ci::JobArtifact do
     subject { Ci::JobArtifact.associated_file_types_for(file_type) }
 
     where(:file_type, :result) do
-      'license_scanning' | %w(license_management license_scanning)
-      'codequality'      | %w(codequality)
-      'quality'          | nil
+      'license_scanning'    | %w(license_management license_scanning)
+      'codequality'         | %w(codequality)
+      'browser_performance' | %w(browser_performance performance)
+      'quality'             | nil
     end
 
     with_them do

ee/spec/presenters/ci/pipeline_presenter_spec.rb

@@ -83,4 +83,103 @@ RSpec.describe Ci::PipelinePresenter do
       it { is_expected.to be_falsey }
     end
   end
+
+  describe '#downloadable_path_for_report_type' do
+    let(:current_user) { create(:user) }
+
+    before do
+      allow(presenter).to receive(:current_user) { current_user }
+    end
+
+    shared_examples '#downloadable_path_for_report_type' do |file_type, license|
+      context 'when feature is available' do
+        before do
+          stub_licensed_features("#{license}": true)
+          project.add_reporter(current_user)
+        end
+
+        it 'returns the downloadable path' do
+          expect(presenter.downloadable_path_for_report_type(file_type)).to include(
+            "#{project.full_path}/-/jobs/#{pipeline.builds.last.id}/artifacts/download?file_type=#{pipeline.builds.last.job_artifacts.last.file_type}")
+        end
+      end
+
+      context 'when feature is not available' do
+        before do
+          stub_licensed_features("#{license}": false)
+          project.add_reporter(current_user)
+        end
+
+        it 'doesn\'t return the downloadable path' do
+          expect(presenter.downloadable_path_for_report_type(file_type)).to eq(nil)
+        end
+      end
+
+      context 'when user is not authorized' do
+        before do
+          stub_licensed_features("#{license}": true)
+          project.add_guest(current_user)
+        end
+
+        it 'doesn\'t return the downloadable path' do
+          expect(presenter.downloadable_path_for_report_type(file_type)).to eq(nil)
+        end
+      end
+    end
+
+    context 'with browser_performance artifact' do
+      let_it_be(:pipeline, reload: true) { create(:ee_ci_pipeline, :with_browser_performance_report, project: project) }
+
+      include_examples '#downloadable_path_for_report_type', :browser_performance, :merge_request_performance_metrics
+    end
+
+    context 'with license_scanning artifact' do
+      let_it_be(:pipeline, reload: true) { create(:ee_ci_pipeline, :with_license_scanning_report, project: project) }
+
+      include_examples '#downloadable_path_for_report_type', :license_scanning, :license_scanning
+    end
+  end
+
+  describe '#degradation_threshold' do
+    let_it_be(:pipeline, reload: true) { create(:ee_ci_pipeline, :with_browser_performance_report, project: project) }
+    let(:current_user) { create(:user) }
+
+    before do
+      allow(presenter).to receive(:current_user) { current_user }
+      allow_any_instance_of(Ci::Build).to receive(:degradation_threshold).and_return(1)
+    end
+
+    context 'when feature is available' do
+      before do
+        project.add_reporter(current_user)
+        stub_licensed_features(merge_request_performance_metrics: true)
+      end
+
+      it 'returns the degradation threshold' do
+        expect(presenter.degradation_threshold(:browser_performance)).to eq(1)
+      end
+    end
+
+    context 'when feature is not available' do
+      before do
+        project.add_reporter(current_user)
+        stub_licensed_features(merge_request_performance_metrics: false)
+      end
+
+      it 'doesn\'t return the degradation threshold' do
+        expect(presenter.degradation_threshold(:browser_performance)).to eq(nil)
+      end
+    end
+
+    context 'when user is not authorized' do
+      before do
+        project.add_guest(current_user)
+        stub_licensed_features(merge_request_performance_metrics: true)
+      end
+
+      it 'doesn\'t return the degradation threshold' do
+        expect(presenter.degradation_threshold(:browser_performance)).to eq(nil)
+      end
+    end
+  end
 end

ee/spec/serializers/merge_request_widget_entity_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe MergeRequestWidgetEntity do
   end
 
   def create_all_artifacts
-    artifacts = %i(codequality performance)
+    artifacts = %i(codequality performance browser_performance)
 
     artifacts.each do |artifact_type|
       create(:ee_ci_build, artifact_type, :success, pipeline: pipeline, project: pipeline.project)
@@ -63,8 +63,9 @@ RSpec.describe MergeRequestWidgetEntity do
     using RSpec::Parameterized::TableSyntax
 
     where(:json_entry, :artifact_type) do
-      :codeclimate         | :codequality
-      :performance         | :performance
+      :codeclimate                 | :codequality
+      :browser_performance         | :browser_performance
+      :browser_performance         | :performance
     end
 
     with_them do
@@ -109,38 +110,59 @@ RSpec.describe MergeRequestWidgetEntity do
       )
 
       allow(head_pipeline).to receive(:available_licensed_report_type?).and_return(true)
-
-      create(
-        :ee_ci_build,
-        :performance,
-        pipeline: head_pipeline,
-        yaml_variables: yaml_variables
-      )
     end
 
-    context "when head pipeline's performance build has the threshold variable defined" do
-      let(:yaml_variables) do
-        [
-          { key: 'FOO', value: 'BAR' },
-          { key: 'DEGRADATION_THRESHOLD', value: '5' }
-        ]
+    shared_examples 'degradation_threshold' do
+      context "when head pipeline's browser performance build has the threshold variable defined" do
+        let(:yaml_variables) do
+          [
+            { key: 'FOO', value: 'BAR' },
+            { key: 'DEGRADATION_THRESHOLD', value: '5' }
+          ]
+        end
+
+        it "returns the value of the variable" do
+          expect(subject.as_json[:browser_performance][:degradation_threshold]).to eq(5)
+        end
       end
 
-      it "returns the value of the variable" do
-        expect(subject.as_json[:performance][:degradation_threshold]).to eq(5)
+      context "when head pipeline's browser performance build has no threshold variable defined" do
+        let(:yaml_variables) do
+          [
+            { key: 'FOO', value: 'BAR' }
+          ]
+        end
+
+        it "returns nil" do
+          expect(subject.as_json[:browser_performance][:degradation_threshold]).to be_nil
+        end
       end
     end
 
-    context "when head pipeline's performance build has no threshold variable defined" do
-      let(:yaml_variables) do
-        [
-          { key: 'FOO', value: 'BAR' }
-        ]
+    context 'with browser_performance artifact' do
+      before do
+        create(
+          :ee_ci_build,
+          :browser_performance,
+          pipeline: head_pipeline,
+          yaml_variables: yaml_variables
+        )
       end
 
-      it "returns nil" do
-        expect(subject.as_json[:performance][:degradation_threshold]).to be_nil
+      include_examples 'degradation_threshold'
+    end
+
+    context 'with performance artifact' do
+      before do
+        create(
+          :ee_ci_build,
+          :performance,
+          pipeline: head_pipeline,
+          yaml_variables: yaml_variables
+        )
       end
+
+      include_examples 'degradation_threshold'
     end
   end
 

lib/gitlab/ci/config/entry/reports.rb

@@ -13,7 +13,7 @@ module Gitlab
 
           ALLOWED_KEYS =
             %i[junit codequality sast secret_detection dependency_scanning container_scanning
-               dast performance license_management license_scanning metrics lsif
+               dast performance browser_performance license_management license_scanning metrics lsif
                dotenv cobertura terraform accessibility cluster_applications
                requirements coverage_fuzzing].freeze
 
@@ -33,6 +33,7 @@ module Gitlab
               validates :container_scanning, array_of_strings_or_string: true
               validates :dast, array_of_strings_or_string: true
               validates :performance, array_of_strings_or_string: true
+              validates :browser_performance, array_of_strings_or_string: true
               validates :license_management, array_of_strings_or_string: true
               validates :license_scanning, array_of_strings_or_string: true
               validates :metrics, array_of_strings_or_string: true

lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml

+# Read more about the feature here: https://docs.gitlab.com/ee/user/project/merge_requests/browser_performance_testing.html
+
 performance:
   stage: performance
   image: docker:19.03.11
   allow_failure: true
   variables:
     DOCKER_TLS_CERTDIR: ""
-    SITESPEED_IMAGE: "sitespeedio/sitespeed.io:11.2.0"
+    SITESPEED_IMAGE: sitespeedio/sitespeed.io
+    SITESPEED_VERSION: 13.3.0
+    SITESPEED_OPTIONS: ''
   services:
     - docker:19.03.11-dind
   script:
@@ -16,22 +20,22 @@ performance:
       fi
     - export CI_ENVIRONMENT_URL=$(cat environment_url.txt)
     - mkdir gitlab-exporter
-    - wget -O gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/1.0.0/index.js
+    - wget -O gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/1.0.1/index.js
     - mkdir sitespeed-results
-    - docker pull --quiet ${SITESPEED_IMAGE}
     - |
       if [ -f .gitlab-urls.txt ]
       then
         sed -i -e 's@^@'"$CI_ENVIRONMENT_URL"'@' .gitlab-urls.txt
-        docker run --shm-size=1g --rm -v "$(pwd)":/sitespeed.io ${SITESPEED_IMAGE} --plugins.add ./gitlab-exporter --outputFolder sitespeed-results .gitlab-urls.txt
+        docker run --shm-size=1g --rm -v "$(pwd)":/sitespeed.io $SITESPEED_IMAGE:$SITESPEED_VERSION --plugins.add ./gitlab-exporter --outputFolder sitespeed-results .gitlab-urls.txt $SITESPEED_OPTIONS
       else
-        docker run --shm-size=1g --rm -v "$(pwd)":/sitespeed.io ${SITESPEED_IMAGE} --plugins.add ./gitlab-exporter --outputFolder sitespeed-results "$CI_ENVIRONMENT_URL"
+        docker run --shm-size=1g --rm -v "$(pwd)":/sitespeed.io $SITESPEED_IMAGE:$SITESPEED_VERSION --plugins.add ./gitlab-exporter --outputFolder sitespeed-results "$CI_ENVIRONMENT_URL" $SITESPEED_OPTIONS
       fi
-    - mv sitespeed-results/data/performance.json performance.json
+    - mv sitespeed-results/data/performance.json browser-performance.json
   artifacts:
     paths:
-      - performance.json
       - sitespeed-results/
+    reports:
+      browser_performance: browser-performance.json
   rules:
     - if: '$CI_KUBERNETES_ACTIVE == null || $CI_KUBERNETES_ACTIVE == ""'
       when: never

lib/gitlab/ci/templates/Verify/Browser-Performance.gitlab-ci.yml

@@ -10,8 +10,9 @@ performance:
   stage: performance
   image: docker:git
   variables:
-    URL: https://example.com
-    SITESPEED_VERSION: 11.2.0
+    URL: ''
+    SITESPEED_IMAGE: sitespeedio/sitespeed.io
+    SITESPEED_VERSION: 13.3.0
     SITESPEED_OPTIONS: ''
   services:
     - docker:stable-dind
@@ -19,11 +20,10 @@ performance:
     - mkdir gitlab-exporter
     - wget -O ./gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/master/index.js
     - mkdir sitespeed-results
-    - docker run --shm-size=1g --rm -v "$(pwd)":/sitespeed.io sitespeedio/sitespeed.io:$SITESPEED_VERSION --plugins.add ./gitlab-exporter --outputFolder sitespeed-results $URL $SITESPEED_OPTIONS
-    - mv sitespeed-results/data/performance.json performance.json
+    - docker run --shm-size=1g --rm -v "$(pwd)":/sitespeed.io $SITESPEED_IMAGE:$SITESPEED_VERSION --plugins.add ./gitlab-exporter --outputFolder sitespeed-results $URL $SITESPEED_OPTIONS
+    - mv sitespeed-results/data/performance.json browser-performance.json
   artifacts:
     paths:
-      - performance.json
       - sitespeed-results/
     reports:
-      performance: performance.json
+      browser_performance: browser-performance.json

locale/gitlab.pot

@@ -24452,6 +24452,9 @@ msgstr ""
 msgid "Total Contributions"
 msgstr ""
 
+msgid "Total Score"
+msgstr ""
+
 msgid "Total artifacts size: %{total_size}"
 msgstr ""
 
@@ -27082,6 +27085,12 @@ msgstr ""
 msgid "cannot merge"
 msgstr ""
 
+msgid "ciReport|%{degradedNum} degraded"
+msgstr ""
+
+msgid "ciReport|%{improvedNum} improved"
+msgstr ""
+
 msgid "ciReport|%{linkStartTag}Learn more about Container Scanning %{linkEndTag}"
 msgstr ""
 
@@ -27109,6 +27118,9 @@ msgstr ""
 msgid "ciReport|%{reportType}: Loading resulted in an error"
 msgstr ""
 
+msgid "ciReport|%{sameNum} same"
+msgstr ""
+
 msgid "ciReport|(errors when loading results)"
 msgstr ""
 
@@ -27133,6 +27145,12 @@ msgstr ""
 msgid "ciReport|Base pipeline codequality artifact not found"
 msgstr ""
 
+msgid "ciReport|Browser performance test metrics: "
+msgstr ""
+
+msgid "ciReport|Browser performance test metrics: No changes"
+msgstr ""
+
 msgid "ciReport|Code quality"
 msgstr ""
 
@@ -27205,15 +27223,9 @@ msgstr ""
 msgid "ciReport|No changes to code quality"
 msgstr ""
 
-msgid "ciReport|No changes to performance metrics"
-msgstr ""
-
 msgid "ciReport|No code quality issues found"
 msgstr ""
 
-msgid "ciReport|Performance metrics"
-msgstr ""
-
 msgid "ciReport|Resolve with merge request"
 msgstr ""
 

spec/lib/gitlab/ci/config/entry/reports_spec.rb

@@ -44,6 +44,8 @@ RSpec.describe Gitlab::Ci::Config::Entry::Reports do
         :license_management | 'gl-license-management-report.json'
         :license_scanning | 'gl-license-scanning-report.json'
         :performance | 'performance.json'
+        :browser_performance | 'browser-performance.json'
+        :browser_performance | 'performance.json'
         :lsif | 'lsif.json'
         :dotenv | 'build.dotenv'
         :cobertura | 'cobertura-coverage.xml'

spec/models/plan_limits_spec.rb

@@ -190,6 +190,7 @@ RSpec.describe PlanLimits do
         ci_max_artifact_size_license_management
         ci_max_artifact_size_license_scanning
         ci_max_artifact_size_performance
+        ci_max_artifact_size_browser_performance
         ci_max_artifact_size_metrics
         ci_max_artifact_size_metrics_referee
         ci_max_artifact_size_network_referee

spec/services/ci/retry_build_service_spec.rb

@@ -33,8 +33,8 @@ RSpec.describe Ci::RetryBuildService do
        job_artifacts_sast job_artifacts_secret_detection job_artifacts_dependency_scanning
        job_artifacts_container_scanning job_artifacts_dast
        job_artifacts_license_management job_artifacts_license_scanning
-       job_artifacts_performance job_artifacts_lsif
-       job_artifacts_terraform job_artifacts_cluster_applications
+       job_artifacts_performance job_artifacts_browser_performance
+       job_artifacts_lsif job_artifacts_terraform job_artifacts_cluster_applications
        job_artifacts_codequality job_artifacts_metrics scheduled_at
        job_variables waiting_for_resource_at job_artifacts_metrics_referee
        job_artifacts_network_referee job_artifacts_dotenv