From ef61f7b87097d55fdee0a083b08392bfc682cbe7 Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <heinrich@gitlab.com>
Date: Thu, 6 Jun 2019 09:08:09 +0800
Subject: [PATCH 1/2] Only run failing system spec

---
 .gitlab/ci/rails.gitlab-ci.yml | 49 +++++++---------------------------
 spec/support/capybara.rb       |  5 ++++
 2 files changed, 15 insertions(+), 39 deletions(-)

diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index 2eb06a123a9332..55825f01809ab0 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -68,7 +68,9 @@
     - scripts/gitaly-test-spawn
     - date
     - 'export KNAPSACK_TEST_FILE_PATTERN=$(ruby -r./lib/quality/test_level.rb -e "puts Quality::TestLevel.new.pattern(:${TEST_LEVEL})")'
-    - knapsack rspec "--color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag level:${TEST_LEVEL} --tag ~geo"
+    - mkdir -p chrome
+    - export CHROME_LOG_FILE=chrome/chrome_debug.log
+    - bundle exec rspec --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml spec/features/projects/files/user_browses_files_spec.rb
     - date
   artifacts:
     expire_in: 31d
@@ -146,17 +148,16 @@ setup-test-env:
   except:
     - /(^docs[\/-].*|.*-docs$)/
 
-rspec unit pg:
-  <<: *rspec-metadata-pg
-  parallel: 20
-
-rspec integration pg:
-  <<: *rspec-metadata-pg
-  parallel: 6
-
 rspec system pg:
   <<: *rspec-metadata-pg
   parallel: 24
+  artifacts:
+    when: on_failure
+    expire_in: 1d
+    paths:
+      - log/test.log
+      - log/test_json.log
+      - chrome
 
 rspec unit pg-10:
   <<: *rspec-metadata-pg-10
@@ -388,18 +389,6 @@ coverage:
   <<: *rspec-metadata-ee
   <<: *use-mysql-with-elasticsearch
 
-rspec unit pg ee:
-  <<: *rspec-metadata-pg-ee
-  parallel: 7
-
-rspec integration pg ee:
-  <<: *rspec-metadata-pg-ee
-  parallel: 3
-
-rspec system pg ee:
-  <<: *rspec-metadata-pg-ee
-  parallel: 5
-
 rspec unit mysql ee:
   <<: *rspec-metadata-mysql-ee
   <<: *only-schedules-master
@@ -443,24 +432,6 @@ rspec system mysql ee on-demand:
     - scripts/gitaly-test-spawn
     - knapsack rspec "-Ispec --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag geo"
 
-rspec geo pg ee:
-  <<: *rspec-metadata-pg-geo
-  <<: *use-pg
-  parallel: 3
-  except:
-    - /(^geo[\/-].*|.*-geo$)/
-    - /(^docs[\/-].*|.*-docs$)/
-    - /(^qa[\/-].*|.*-qa$)/
-
-rspec geo pg-10 ee:
-  <<: *rspec-metadata-pg-geo
-  <<: *use-pg-10
-  parallel: 3
-  except:
-    - /(^geo[\/-].*|.*-geo$)/
-    - /(^docs[\/-].*|.*-docs$)/
-    - /(^qa[\/-].*|.*-qa$)/
-
 quick-rspec geo pg ee:
   <<: *rspec-metadata-pg-geo
   <<: *use-pg
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index 875a9a76e12caa..7999388ef02984 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -42,6 +42,11 @@
   # Disable /dev/shm use in CI. See https://gitlab.com/gitlab-org/gitlab-ee/issues/4252
   options.add_argument("disable-dev-shm-usage") if ENV['CI'] || ENV['CI_SERVER']
 
+  # Enable verbose logging
+  options.add_argument("enable-logging")
+  options.add_argument("log-level=0")
+  options.add_argument("v=10")
+
   Capybara::Selenium::Driver.new(
     app,
     browser: :chrome,
-- 
GitLab


From 058f62c145aed163f3032853e40bdacb74e4ddbf Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <heinrich@gitlab.com>
Date: Tue, 11 Jun 2019 16:52:56 +0800
Subject: [PATCH 2/2] Add explicit user-data-dir

---
 spec/support/capybara.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index 7999388ef02984..61d6b2d58c5d3f 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -42,6 +42,8 @@
   # Disable /dev/shm use in CI. See https://gitlab.com/gitlab-org/gitlab-ee/issues/4252
   options.add_argument("disable-dev-shm-usage") if ENV['CI'] || ENV['CI_SERVER']
 
+  options.add_argument("user-data-dir=chrome") if ENV['CI'] || ENV['CI_SERVER']
+
   # Enable verbose logging
   options.add_argument("enable-logging")
   options.add_argument("log-level=0")
-- 
GitLab