Changed sqitch version to 1.4.0.

.expeditor/automate_build.sh

@@ -42,6 +42,10 @@ HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CA
 
 git clone https://github.com/chef/automate.git
 cd automate
+if [ "${AUTOMATE_BRANCH}" != "" ]
+then
+  git checkout "${AUTOMATE_BRANCH}"
+fi
 
 RESOLVED_RESULTS_DIR=$(realpath results/)
 export DO_CHECK=true

.expeditor/chef_server.sh

@@ -1,12 +1,15 @@
-#!/bin/bash
+#!/bin/bash -e
 
 #===============================================================================
 #Downloading the automate repo
 #===============================================================================
 
 git clone https://github.com/chef/automate.git
 cd automate
-git checkout kalroy/cs_plan_changes
+if [ "${AUTOMATE_BRANCH}" != "" ]
+then
+  git checkout "${AUTOMATE_BRANCH}"
+fi
 
 #===============================================================================
 chmod +x ./integration/tests/chef_server.sh

.expeditor/chef_server_only.sh

@@ -1,12 +1,15 @@
-#!/bin/bash
+#!/bin/bash -e
 
 #===============================================================================
 #Downloading the automate repo
 #===============================================================================
 
 git clone https://github.com/chef/automate.git
 cd automate
-git checkout kalroy/cs_plan_changes
+if [ "${AUTOMATE_BRANCH}" != "" ]
+then
+  git checkout "${AUTOMATE_BRANCH}"
+fi
 
 #===============================================================================
 chmod +x ./integration/tests/chef_server_only.sh

.expeditor/ha_chef_server.sh

@@ -1,12 +1,15 @@
-#!/bin/bash
+#!/bin/bash -e
 
 #===============================================================================
 #Downloading the automate repo
 #===============================================================================
 
 git clone https://github.com/chef/automate.git
 cd automate
-git checkout kalroy/cs_plan_changes
+if [ "${AUTOMATE_BRANCH}" != "" ]
+then
+  git checkout "${AUTOMATE_BRANCH}"
+fi
 
 #===============================================================================
 

.expeditor/verify.pipeline.yml

@@ -259,6 +259,14 @@ steps:
     - .expeditor/ha_chef_server.sh
   env:
     IS_AUTOMATE: true
+    DOCKER_CONFIG: /var/lib/buildkite-agent/.docker
+    HAB_BLDR_CHANNEL: "stable"
+    #HAB_STUDIO_SECRET_HAB_BLDR_CHANNEL: "curl8"
+    #HAB_FALLBACK_CHANNEL: "stable"
+    HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "stable"
+    GOPROXY: "https://proxy.golang.org,direct"
+    GOSUMDB: "sum.golang.org"
+    PGGSSENCMODE: "disable"
   timeout_in_minutes: 35
   expeditor:
     secrets:

.license_scout.yml

@@ -213,4 +213,6 @@ exceptions:
       reason: Exception made by Chef Legal
     - name: core/nss-myhostname
       reason: Exception made by Chef Legal
+    - name: core/xz
+      reason: Exception made by Chef Legal
 

CHANGELOG.md

@@ -1,27 +1,36 @@
 # Chef Server Changelog
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.10.20 -->
-## [15.10.20](https://github.com/chef/chef-server/tree/15.10.20) (2024-11-22)
+<!-- latest_release 15.10.24 -->
+## [15.10.24](https://github.com/chef/chef-server/tree/15.10.24) (2024-12-20)
 
 #### Merged Pull Requests
-- Telemetry automate changes. [#3946](https://github.com/chef/chef-server/pull/3946) ([sreepuramsudheer](https://github.com/sreepuramsudheer))
+- postgresql 13.14 -&gt; 13.18 (CVE-2024-7348) [#3952](https://github.com/chef/chef-server/pull/3952) ([lbakerchef](https://github.com/lbakerchef))
 <!-- latest_release -->
 
-<!-- release_rollup since=15.10.12 -->
-### Changes since 15.10.12 release
+<!-- release_rollup since=15.10.21 -->
+### Changes since 15.10.21 release
 
 #### Merged Pull Requests
-- Telemetry automate changes. [#3946](https://github.com/chef/chef-server/pull/3946) ([sreepuramsudheer](https://github.com/sreepuramsudheer)) <!-- 15.10.20 -->
-- License Enforcement Application [#3929](https://github.com/chef/chef-server/pull/3929) ([jashaik](https://github.com/jashaik)) <!-- 15.10.19 -->
-- Open-Search  upgraded to 1.3.19 [#3931](https://github.com/chef/chef-server/pull/3931) ([talktovikas](https://github.com/talktovikas)) <!-- 15.10.18 -->
-- Build tests for embedded Chef-Server in Automate [#3917](https://github.com/chef/chef-server/pull/3917) ([talktovikas](https://github.com/talktovikas)) <!-- 15.10.17 -->
-- added updated production url spelling [#3908](https://github.com/chef/chef-server/pull/3908) ([vviveksharma](https://github.com/vviveksharma)) <!-- 15.10.16 -->
-- License Usage Pointer Update [#3906](https://github.com/chef/chef-server/pull/3906) ([dishanktiwari2501](https://github.com/dishanktiwari2501)) <!-- 15.10.15 -->
-- Update README file [#3905](https://github.com/chef/chef-server/pull/3905) ([kalroy](https://github.com/kalroy)) <!-- 15.10.14 -->
-- Added telemetry section in README [#3870](https://github.com/chef/chef-server/pull/3870) ([kalroy](https://github.com/kalroy)) <!-- 15.10.13 -->
+- postgresql 13.14 -&gt; 13.18 (CVE-2024-7348) [#3952](https://github.com/chef/chef-server/pull/3952) ([lbakerchef](https://github.com/lbakerchef)) <!-- 15.10.24 -->
+- Pinning meck to 0.9.2. [#3966](https://github.com/chef/chef-server/pull/3966) ([sreepuramsudheer](https://github.com/sreepuramsudheer)) <!-- 15.10.23 -->
+- Space changes to trigger version bump. [#3965](https://github.com/chef/chef-server/pull/3965) ([sreepuramsudheer](https://github.com/sreepuramsudheer)) <!-- 15.10.22 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [15.10.21](https://github.com/chef/chef-server/tree/15.10.21) (2024-12-04)
+
+#### Merged Pull Requests
+- Added telemetry section in README [#3870](https://github.com/chef/chef-server/pull/3870) ([kalroy](https://github.com/kalroy))
+- Update README file [#3905](https://github.com/chef/chef-server/pull/3905) ([kalroy](https://github.com/kalroy))
+- License Usage Pointer Update [#3906](https://github.com/chef/chef-server/pull/3906) ([dishanktiwari2501](https://github.com/dishanktiwari2501))
+- added updated production url spelling [#3908](https://github.com/chef/chef-server/pull/3908) ([vviveksharma](https://github.com/vviveksharma))
+- Build tests for embedded Chef-Server in Automate [#3917](https://github.com/chef/chef-server/pull/3917) ([talktovikas](https://github.com/talktovikas))
+- Open-Search  upgraded to 1.3.19 [#3931](https://github.com/chef/chef-server/pull/3931) ([talktovikas](https://github.com/talktovikas))
+- License Enforcement Application [#3929](https://github.com/chef/chef-server/pull/3929) ([jashaik](https://github.com/jashaik))
+- Telemetry automate changes. [#3946](https://github.com/chef/chef-server/pull/3946) ([sreepuramsudheer](https://github.com/sreepuramsudheer))
+- Telemetry code refactor. [#3948](https://github.com/chef/chef-server/pull/3948) ([sreepuramsudheer](https://github.com/sreepuramsudheer))
+<!-- latest_stable_release -->
+
 ## [15.10.12](https://github.com/chef/chef-server/tree/15.10.12) (2024-08-29)
 
 #### Merged Pull Requests
@@ -48,7 +57,6 @@
 - Update the supported platforms [#3890](https://github.com/chef/chef-server/pull/3890) ([kalroy](https://github.com/kalroy))
 - Fix for 12.17.15 -&gt; 15.10.X upgrade [#3902](https://github.com/chef/chef-server/pull/3902) ([jashaik](https://github.com/jashaik))
 - Fixing verify pipeline fixes. [#3903](https://github.com/chef/chef-server/pull/3903) ([sreepuramsudheer](https://github.com/sreepuramsudheer))
-<!-- latest_stable_release -->
 
 ## [15.9.38](https://github.com/chef/chef-server/tree/15.9.38) (2024-05-30)
 

README.md

@@ -129,7 +129,7 @@ If you're looking to contribute to certain parts of the Chef Infra Server, famil
 
 ## Chef Expeditor
 
-The `chef/chef-server` repository, like many other Chef Software repositories, leverages an internal utility called Chef Expeditor to create a pub-sub model of actions across our various CI/CD utilities.
+The `chef/chef-server`  repository, like many other Chef Software repositories, leverages an internal utility called Chef Expeditor to create a pub-sub model of actions across our various CI/CD utilities.
 
 ## Contributing
 

VERSION

@@ -1 +1 @@
-15.10.20
+15.10.24

dev/defaults.yml

@@ -200,7 +200,7 @@ projects:
         # itself at this time.
         source_path: ../../src/chef-server-ctl/plugins
         # TODO - the gem version will eventually change, we need a good way to keep it in sync with our ruby version
-        dest_path: /opt/opscode/embedded/lib/ruby/gems/3.0.1/gems/chef-server-ctl-1.1.0/plugins
+        dest_path: /opt/opscode/embedded/lib/ruby/gems/3.1.6/gems/chef-server-ctl-1.1.0/plugins
         reconfigure_on_load: false
       upgrades:
         source_path: private-chef-upgrades

omnibus/config/software/postgresql13.rb

@@ -16,7 +16,7 @@
 
 name "postgresql13"
 
-default_version "13.14"
+default_version "13.18"
 
 license "PostgreSQL"
 license_file "COPYRIGHT"
@@ -30,6 +30,7 @@
 dependency "config_guess"
 
 source url: "https://ftp.postgresql.org/pub/source/v#{version}/postgresql-#{version}.tar.bz2"
+version("13.18") { source sha256: "ceea92abee2a8c19408d278b68de6a78b6bd3dbb4fa2d653fa7ca745d666aab1" }
 version("13.14") { source sha256: "b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed" }
 version("13.5") { source sha256: "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3" }
 version("13.6") { source sha256: "bafc7fa3d9d4da8fe71b84c63ba8bdfe8092935c30c0aa85c24b2c08508f67fc" }

omnibus_overrides.rb

@@ -4,13 +4,13 @@
 #
 override :erlang, version: "24.3.2"
 override :'omnibus-ctl', version: "main"
-override :chef, version: "v17.10.0"
+override :chef, version: "v18.6.1"
 override :ohai, version: "v16.17.0"
-override :ruby, version: "3.0.1"
+override :ruby, version: "3.1.6"
 override :perl, version: "5.34.0"
 override :redis, version: "5.0.14"
 override :runit, version: "2.1.1" #standalone upgrade is failing, Needs to be reverted to 2.1.2 after fixing the umbrella
-override :sqitch, version: "0.973"
+override :sqitch, version: "1.4.0"
 
 override :logrotate, version: "3.19.0"
 

src/bookshelf/habitat/plan.sh

@@ -7,7 +7,7 @@ pkg_deps=(
   core/cacerts
   core/coreutils
   core/gcc-libs
-  core/sqitch_pg
+  core/sqitch
 )
 pkg_build_deps=(core/make core/git core/gcc)
 pkg_bin_dirs=(bin)

src/bookshelf/rebar.config

@@ -27,7 +27,8 @@
     {iso8601, ".*",
          {git, "https://github.com/erlsci/iso8601",                 {tag, "1.2.3"}}},
     {meck, ".*",
-        {git, "https://github.com/eproxus/meck",                    {branch, "master"}}},
+    %% NOTE: Pinning version as main branch wants minimum_otp_vsn as 25 and we are currently at 24.
+        {git, "https://github.com/eproxus/meck",                    {ref, "5aaa24886db404f995c9a91b421367f6bfe6e566"}}},
     {mini_s3, ".*",
         {git, "https://github.com/chef/mini_s3",                    {branch, "main"}}},
     {mixer, ".*",

src/chef-server-ctl/habitat/config/secrets-bootstrap.rb

@@ -1,4 +1,4 @@
-#!{{pkgPathFor "core/ruby30"}}/bin/ruby
+#!{{pkgPathFor "core/ruby31"}}/bin/ruby
 
 require "toml"
 require "openssl"

src/chef-server-ctl/habitat/plan.sh

@@ -6,7 +6,7 @@ pkg_deps=(
   core/coreutils
   core/curl
   core/jq-static
-  core/ruby30
+  core/ruby31/3.1.6/20240912144513
   core/libffi
   core/postgresql-client
   core/gcc-libs
@@ -115,7 +115,7 @@ EOF
 
   for i in chef-server-test knife chef-server-ctl; do
       sed -i "s#__PKG_PATH__#${pkg_prefix}#" $wrapper_bin_path/$i
-      sed -i "s#__RUBY_PATH__#$(pkg_path_for core/ruby30)#" $wrapper_bin_path/$i
+      sed -i "s#__RUBY_PATH__#$(pkg_path_for core/ruby31)#" $wrapper_bin_path/$i
   done
 }
 

src/oc-id/habitat/plan.sh

@@ -3,10 +3,10 @@ pkg_origin=chef
 pkg_maintainer="The Chef Server Maintainers <[email protected]>"
 pkg_license=('Apache-2.0')
 pkg_deps=(
-  core/sqitch_pg
+  core/sqitch
   core/curl
   core/node14
-  core/ruby30
+  core/ruby31/3.1.6/20240912144513
   core/rsync
   core/sed
   core/libffi

src/oc_bifrost/habitat/plan.sh

@@ -8,7 +8,7 @@ pkg_deps=(
   core/coreutils
   core/curl
   core/gcc-libs
-  core/sqitch_pg
+  core/sqitch
 )
 pkg_build_deps=(core/make core/git core/gcc)
 pkg_bin_dirs=(bin)