Add latest changes from gitlab-org/gitlab@master

changelogs/unreleased/31649-environment-rollback-was-not-friendly.yml

+---
+title: Resolve environment rollback was not friendly
+merge_request: 20121
+author:
+type: other

doc/administration/high_availability/README.md

@@ -201,13 +201,14 @@ with the added complexity of many more nodes to configure, manage, and monitor.
 ## Reference Architecture Examples
 The Support and Quality teams build, performance test, and validate Reference
-Architectures that support set large numbers of users. The specifications below are a
-representation of this work so far and may be adjusted in the future based on
+Architectures that support large numbers of users. The specifications below are
+a representation of this work so far and may be adjusted in the future based on
 additional testing and iteration.
-The architectures have been tested with specific coded workloads. The throughputs
-used for testing are calculated based on sample customer data. We test each endpoint
-type with the following number of requests per second (RPS) per 1000 users:
+The architectures have been tested with specific coded workloads, and the
+throughputs used for testing were calculated based on sample customer data. We
+test each endpoint type with the following number of requests per second (RPS)
+per 1000 users:
 - API: 20 RPS
 - Web: 2 RPS
@@ -221,9 +222,9 @@ users are, how much automation you use, mirroring, and repo/change size.
 - **Supported Users (approximate):** 10,000
 - **Test RPS Rates:** API: 200 RPS, Web: 20 RPS, Git: 20 RPS
-- **Known Issues:** While validating the reference architecture, slow API endpoints
-  were discovered. For details, see the related issues list in
-  [this issue](https://gitlab.com/gitlab-org/gitlab-foss/issues/64335).
+- **Known Issues:** While validating the reference architectures, slow API
+endpoints were discovered. For details, see the related issues list in
+[this issue](https://gitlab.com/gitlab-org/quality/performance/issues/125).
 | Service                     | Nodes | Configuration         | GCP type      |
 | ----------------------------|-------|-----------------------|---------------|
@@ -248,10 +249,9 @@ vendors a best effort like for like can be used.
 - **Supported Users (approximate):** 25,000
 - **Test RPS Rates:** API: 500 RPS, Web: 50 RPS, Git: 50 RPS
-- **Known Issues:** The slow API endpoints that were discovered during testing
-  the 10,000 user architecture also affect the 25,000 user architecture. For
-  details, see the related issues list in
-  [this issue](https://gitlab.com/gitlab-org/gitlab-foss/issues/64335).
+- **Known Issues:** While validating the reference architectures, slow API
+endpoints were discovered. For details, see the related issues list in
+[this issue](https://gitlab.com/gitlab-org/quality/performance/issues/125).
 | Service                     | Nodes | Configuration         | GCP type      |
 | ----------------------------|-------|-----------------------|---------------|
@@ -276,12 +276,9 @@ vendors a best effort like for like can be used.
 - **Supported Users (approximate):** 50,000
 - **Test RPS Rates:** API: 1000 RPS, Web: 100 RPS, Git: 100 RPS
-- **Status:** Work-in-progress
-- **Related Issue:** See the [related issue](https://gitlab.com/gitlab-org/quality/performance/issues/66) for more information.
-
-NOTE: **Note:**  This architecture is a work-in-progress of the work so far. The
-Quality team will be certifying this environment in late 2019. The specifications
-may be adjusted prior to certification based on performance testing.
+- **Known Issues:** While validating the reference architectures, slow API
+endpoints were discovered. For details, see the related issues list in
+[this issue](https://gitlab.com/gitlab-org/quality/performance/issues/125).
 | Service                     | Nodes | Configuration         | GCP type      |
 | ----------------------------|-------|-----------------------|---------------|

doc/ci/environments.md

@@ -485,6 +485,13 @@ To retry or rollback a deployment:
    - **Retry** button next to the last deployment, to retry that deployment.
    - **Rollback** button next to a previously successful deployment, to roll back to that deployment.
+#### What to expect with a rollback
+
+Pressing the **Rollback** button on a specific commit will trigger a _new_ deployment with its
+own unique job ID.
+
+This means that you will see a new deployment that points to the commit you are rolling back to.
+
 NOTE: **Note:**
 The defined deployment process in the job's `script` determines whether the rollback succeeds or not.

qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb

@@ -4,11 +4,6 @@ require 'pathname'
 module QA
   context 'Configure' do
-    def login
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.perform(&:sign_in_using_credentials)
-    end
-
     def disable_optional_jobs(project)
       # Disable code_quality check in Auto DevOps pipeline as it takes
       # too long and times out the test
@@ -66,7 +61,7 @@ module QA
         end
         it 'runs auto devops' do
-          login
+          Flow::Login.sign_in
           @project = Resource::Project.fabricate! do |p|
             p.name = Runtime::Env.auto_devops_project_name || 'project-with-autodevops'
@@ -148,7 +143,7 @@ module QA
     describe 'Auto DevOps', :smoke do
       before do
-        login
+        Flow::Login.sign_in
         @project = Resource::Project.fabricate_via_browser_ui! do |p|
           p.name = "project-with-autodevops-#{SecureRandom.hex(8)}"

qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb

@@ -4,8 +4,7 @@ module QA
   context 'Performance bar' do
     context 'when logged in as an admin user', :requires_admin do
       before do
-        Runtime::Browser.visit(:gitlab, Page::Main::Login)
-        Page::Main::Login.perform(&:sign_in_using_admin_credentials)
+        Flow::Login.sign_in_as_admin
         Page::Main::Menu.perform(&:go_to_admin_area)
         Page::Admin::Menu.perform(&:go_to_metrics_and_profiling_settings)