Merge branch 'ce_upstream' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream

.gitlab-ci.yml

@@ -180,14 +180,6 @@ stages:
 build-package:
   image: ruby:2.4-alpine
   before_script: []
-<<<<<<< HEAD
-  services: []
-  variables:
-    SETUP_DB: "false"
-    USE_BUNDLE_INSTALL: "false"
-    EE_PACKAGE: "true"
-=======
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
   stage: build
   cache: {}
   when: manual
@@ -324,73 +316,8 @@ setup-test-env:
       - public/assets
       - tmp/tests
 
-<<<<<<< HEAD
-rspec-pg 0 25: *rspec-metadata-pg
-rspec-pg 1 25: *rspec-metadata-pg
-rspec-pg 2 25: *rspec-metadata-pg
-rspec-pg 3 25: *rspec-metadata-pg
-rspec-pg 4 25: *rspec-metadata-pg
-rspec-pg 5 25: *rspec-metadata-pg
-rspec-pg 6 25: *rspec-metadata-pg
-rspec-pg 7 25: *rspec-metadata-pg
-rspec-pg 8 25: *rspec-metadata-pg
-rspec-pg 9 25: *rspec-metadata-pg
-rspec-pg 10 25: *rspec-metadata-pg
-rspec-pg 11 25: *rspec-metadata-pg
-rspec-pg 12 25: *rspec-metadata-pg
-rspec-pg 13 25: *rspec-metadata-pg
-rspec-pg 14 25: *rspec-metadata-pg
-rspec-pg 15 25: *rspec-metadata-pg
-rspec-pg 16 25: *rspec-metadata-pg
-rspec-pg 17 25: *rspec-metadata-pg
-rspec-pg 18 25: *rspec-metadata-pg
-rspec-pg 19 25: *rspec-metadata-pg
-rspec-pg 20 25: *rspec-metadata-pg
-rspec-pg 21 25: *rspec-metadata-pg
-rspec-pg 22 25: *rspec-metadata-pg
-rspec-pg 23 25: *rspec-metadata-pg
-rspec-pg 24 25: *rspec-metadata-pg
-
 rspec-pg geo: *rspec-metadata-pg-geo
 
-rspec-mysql 0 25: *rspec-metadata-mysql
-rspec-mysql 1 25: *rspec-metadata-mysql
-rspec-mysql 2 25: *rspec-metadata-mysql
-rspec-mysql 3 25: *rspec-metadata-mysql
-rspec-mysql 4 25: *rspec-metadata-mysql
-rspec-mysql 5 25: *rspec-metadata-mysql
-rspec-mysql 6 25: *rspec-metadata-mysql
-rspec-mysql 7 25: *rspec-metadata-mysql
-rspec-mysql 8 25: *rspec-metadata-mysql
-rspec-mysql 9 25: *rspec-metadata-mysql
-rspec-mysql 10 25: *rspec-metadata-mysql
-rspec-mysql 11 25: *rspec-metadata-mysql
-rspec-mysql 12 25: *rspec-metadata-mysql
-rspec-mysql 13 25: *rspec-metadata-mysql
-rspec-mysql 14 25: *rspec-metadata-mysql
-rspec-mysql 15 25: *rspec-metadata-mysql
-rspec-mysql 16 25: *rspec-metadata-mysql
-rspec-mysql 17 25: *rspec-metadata-mysql
-rspec-mysql 18 25: *rspec-metadata-mysql
-rspec-mysql 19 25: *rspec-metadata-mysql
-rspec-mysql 20 25: *rspec-metadata-mysql
-rspec-mysql 21 25: *rspec-metadata-mysql
-rspec-mysql 22 25: *rspec-metadata-mysql
-rspec-mysql 23 25: *rspec-metadata-mysql
-rspec-mysql 24 25: *rspec-metadata-mysql
-
-spinach-pg 0 5: *spinach-metadata-pg
-spinach-pg 1 5: *spinach-metadata-pg
-spinach-pg 2 5: *spinach-metadata-pg
-spinach-pg 3 5: *spinach-metadata-pg
-spinach-pg 4 5: *spinach-metadata-pg
-
-spinach-mysql 0 5: *spinach-metadata-mysql
-spinach-mysql 1 5: *spinach-metadata-mysql
-spinach-mysql 2 5: *spinach-metadata-mysql
-spinach-mysql 3 5: *spinach-metadata-mysql
-spinach-mysql 4 5: *spinach-metadata-mysql
-=======
 rspec-pg 0 26: *rspec-metadata-pg
 rspec-pg 1 26: *rspec-metadata-pg
 rspec-pg 2 26: *rspec-metadata-pg
@@ -454,7 +381,6 @@ spinach-mysql 0 4: *spinach-metadata-mysql
 spinach-mysql 1 4: *spinach-metadata-mysql
 spinach-mysql 2 4: *spinach-metadata-mysql
 spinach-mysql 3 4: *spinach-metadata-mysql
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
 
 # Static analysis jobs
 .ruby-static-analysis: &ruby-static-analysis

lib/backup/manager.rb

@@ -137,19 +137,12 @@ module Backup
 
         # restoring mismatching backups can lead to unexpected problems
         if settings[:gitlab_version] != Gitlab::VERSION
-<<<<<<< HEAD
-          $progress.puts 'GitLab version mismatch:'.color(:red)
-          $progress.puts "  Your current GitLab version (#{Gitlab::VERSION}) differs from the GitLab version in the backup!".color(:red)
-          $progress.puts '  Please switch to the following version and try again:'.color(:red)
-          $progress.puts "  version: #{settings[:gitlab_version]}".color(:red)
-=======
           $progress.puts(<<~HEREDOC.color(:red))
             GitLab version mismatch:
               Your current GitLab version (#{Gitlab::VERSION}) differs from the GitLab version in the backup!
               Please switch to the following version and try again:
               version: #{settings[:gitlab_version]}
           HEREDOC
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
           $progress.puts
           $progress.puts "Hint: git checkout v#{settings[:gitlab_version]}"
           exit 1

scripts/trigger-build-omnibus

@@ -3,13 +3,20 @@
 require 'net/http'
 require 'json'
 
+#
+# Dummy way to find out in which repo we are, CE or EE
+#
+def ee?
+  File.exist?('CHANGELOG-EE.md')
+end
+
 uri = URI('https://gitlab.com/api/v4/projects/20699/trigger/pipeline')
 params = {
   "ref" => ENV["OMNIBUS_BRANCH"] || "master",
   "token" => ENV["BUILD_TRIGGER_TOKEN"],
   "variables[GITLAB_VERSION]" => ENV["CI_COMMIT_SHA"],
   "variables[ALTERNATIVE_SOURCES]" => true,
-  "variables[ee]" => ENV["EE_PACKAGE"] || "false"
+  "variables[ee]" => ee? ? 'true' : 'false'
 }
 
 Dir.glob("*_VERSION").each do |version_file|