Merge branch 'master' of gitlab.com:gitlab-org/omnibus-gitlab into pitr

.gitlab-ci.yml

@@ -64,7 +64,7 @@ variables:
   AUTO_DEPLOY_TAG_REGEX: '^\d+\.\d+\.\d+\+[^ ]{7,}\.[^ ]{7,}$'
   # Default environment for auto-deploy
   AUTO_DEPLOY_ENVIRONMENT: 'pre'
-  MAX_PACKAGE_SIZE_MB: "850"
+  MAX_PACKAGE_SIZE_MB: "860"
   OMNIBUS_GITLAB_MIRROR_ID: "14588374"
 ### For services that need a docker daemon

CHANGELOG.md

@@ -3,6 +3,13 @@
 The latest version of this file can be found at the master branch of the
 omnibus-gitlab repository.
+## 13.4.4 (2020-10-15)
+
+### Fixed (1 change)
+
+- Force install PrettyTable 0.7. !4628
+
+
 ## 13.4.3 (2020-10-06)
 - No changes.

Gemfile

@@ -21,7 +21,7 @@ omnibus_gem_version = Gitlab::Version.new('omnibus', "7.0.10.02")
 #    definitions in `config/software`.  You can find them quickly with:
 #      grep "gem 'install " config/software/*
 gem 'omnibus', git: omnibus_gem_version.remote, tag: omnibus_gem_version.print(false)
-gem 'chef', '~> 15.12.22'
+gem 'chef', '~> 15.14.0'
 gem 'ohai', '~> 15.12.0'
 gem 'package_cloud'
 gem 'rainbow', '~> 2.2' # This is used by gitlab-ctl and the chef formatter

Gemfile.lock

@@ -47,12 +47,12 @@ GEM
     binding_ninja (0.2.3)
     builder (3.2.4)
     byebug (9.0.5)
-    chef (15.12.22)
+    chef (15.14.0)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.12.22)
-      chef-utils (= 15.12.22)
+      chef-config (= 15.14.0)
+      chef-utils (= 15.14.0)
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
@@ -92,16 +92,16 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
       paint (>= 1, < 3)
       solve (> 2.0, < 5.0)
-    chef-config (15.12.22)
+    chef-config (15.14.0)
       addressable
-      chef-utils (= 15.12.22)
+      chef-utils (= 15.14.0)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
     chef-sugar (5.1.9)
-    chef-utils (15.12.22)
-    chef-zero (15.0.0)
+    chef-utils (15.14.0)
+    chef-zero (15.0.3)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 5.0)
       mixlib-log (>= 2.0, < 4.0)
@@ -141,7 +141,7 @@ GEM
     fauxhai-ng (8.2.0)
       net-ssh
     ffi (1.13.1)
-    ffi-libarchive (1.0.3)
+    ffi-libarchive (1.0.4)
       ffi (~> 1.0)
     ffi-yajl (2.3.3)
       libyajl2 (~> 1.2)
@@ -225,7 +225,7 @@ GEM
     minitar (0.9)
     mixlib-archive (1.0.5)
       mixlib-log
-    mixlib-authentication (3.0.6)
+    mixlib-authentication (3.0.7)
     mixlib-cli (2.1.6)
     mixlib-config (3.0.6)
       tomlrb
@@ -367,15 +367,16 @@ GEM
     toml-rb (2.0.1)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.3.0)
-    train-core (3.3.6)
+    train-core (3.3.24)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 4.0)
       net-ssh (>= 2.9, < 7.0)
-    train-winrm (0.2.6)
+    train-winrm (0.2.11)
       winrm (~> 2.0)
+      winrm-elevated (~> 1.2.2)
       winrm-fs (~> 1.0)
     tty-box (0.5.0)
       pastel (~> 0.7.2)
@@ -416,7 +417,11 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-fs (1.3.4)
+    winrm-elevated (1.2.2)
+      erubi (~> 1.8)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    winrm-fs (1.3.5)
       erubi (~> 1.8)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 2.0)
@@ -430,7 +435,7 @@ PLATFORMS
 DEPENDENCIES
   byebug
-  chef (~> 15.12.22)
+  chef (~> 15.14.0)
   chefspec
   docker-api
   fantaskspec

changelogs/unreleased/3970-docker-assets-download-package-should-fail-when-package-is-not-found.yml

+---
+title: Error during docker build on package download failure
+merge_request: 4641
+author:
+type: fixed

changelogs/unreleased/5384-poc-allow-promotion-task-to-alter-geo-node-configuration.yml

+---
+title: Allow promotion task to alter Geo node configuration
+merge_request: 4609
+author:
+type: added

changelogs/unreleased/5570-puma-socket-configuration-option-needs-to-also-reconfigure-workhorse.yml

+---
+title: Update workhorse auth socket when puma uses custom socket
+merge_request: 4620
+author:
+type: fixed

changelogs/unreleased/5662-support-revert-pg-upgrade-for-patroni-cluster-nodes.yml

+---
+title: Support revert-pg-upgrade for Patroni cluster nodes
+merge_request: 4611
+author:
+type: added

changelogs/unreleased/5688-opensuse-15-1-deprecation.yml

+---
+title: Add deprecation warning for openSUSE Leap 15.1
+merge_request: 4610
+author:
+type: deprecated

changelogs/unreleased/5701-gitlab-ctl-patroni-members-results-in-error-with-prettytable.yml

----
-title: Force install PrettyTable 0.7
-merge_request: 4628
-author:
-type: fixed

changelogs/unreleased/deps-6885bc4-6ec9894.yml

+---
+title: Update Chef from 15.12.22 to 15.14.0
+merge_request: 4537
+author:
+type: changed

changelogs/unreleased/pages-object-storage-settings.yml

+---
+title: Add pages object storage settings
+merge_request: 4623
+author:
+type: added

changelogs/unreleased/sh-add-gitlab-email-settings-template.yml

+---
+title: Move email configuration section closer to SMTP settings in template
+merge_request: 4631
+author:
+type: other

changelogs/unreleased/sh-enable-wal-log-hints.yml

+---
+title: Expose wal_log_hints PostgreSQL setting
+merge_request: 4642
+author:
+type: added

changelogs/unreleased/sh-reduce-arm-build-size.yml

+---
+title: Reduce Ubuntu 20 ARM package size
+merge_request: 4637
+author:
+type: other

config/projects/gitlab.rb

@@ -208,8 +208,12 @@ exclude 'embedded/lib/ruby/gems/*/gems/*/sample'
 exclude 'embedded/lib/ruby/gems/*/gems/*/script'
 exclude 'embedded/lib/ruby/gems/*/gems/*/t'
-# Exclude additional test files from specific gems
+# Exclude additional files from specific gems
+exclude 'embedded/lib/ruby/gems/*/gems/grpc-*/include'
+exclude 'embedded/lib/ruby/gems/*/gems/grpc-*/src/core'
+exclude 'embedded/lib/ruby/gems/*/gems/grpc-*/src/ruby/ext'
 exclude 'embedded/lib/ruby/gems/*/gems/grpc-*/src/ruby/spec'
+exclude 'embedded/lib/ruby/gems/*/gems/grpc-*/third_party'
 # Enable signing packages
 package :rpm do

config/software/chef-bin.rb

 name 'chef-bin'
 # The version here should be in agreement with /Gemfile.lock so that our rspec
 # testing stays consistent with the package contents.
-default_version '15.12.22'
+default_version '15.14.0'
 license 'Apache-2.0'
 license_file 'LICENSE'

config/software/chef-gem.rb

@@ -17,7 +17,7 @@
 name 'chef-gem'
 # The version here should be in agreement with /Gemfile.lock so that our rspec
 # testing stays consistent with the package contents.
-default_version '15.12.22'
+default_version '15.14.0'
 license 'Apache-2.0'
 license_file 'LICENSE'

config/software/chef-zero.rb

@@ -17,7 +17,7 @@
 name 'chef-zero'
 # The version here should be in agreement with /Gemfile.lock so that our rspec
 # testing stays consistent with the package contents.
-default_version '15.0.0'
+default_version '15.0.3'
 license 'Apache-2.0'
 license_file 'LICENSE'

config/software/mixlib-log.rb

@@ -17,7 +17,7 @@
 name 'mixlib-log'
 # The version here should be in agreement with /Gemfile.lock so that our rspec
 # testing stays consistent with the package contents.
-default_version '3.0.8'
+default_version '3.0.9'
 license 'Apache-2.0'
 license_file 'LICENSE'