Merge branch 'main' into CHEF-2040

.expeditor/license_scout.sh

@@ -21,10 +21,11 @@ if [[ "${BUILDKITE:-false}" == "true" ]]; then
   # Since we don't use any software from this repository in our tests,
   # we can temporarily remove it from our sources.
   rm /etc/apt/sources.list.d/microsoft-prod.list
+  wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
   apt-get clean
   apt-get autoremove 
   apt-get update
-  apt-get install -y libpq-dev libsqlite3-dev
+  apt-get install -y libpq-dev libsqlite3-dev libyaml-dev
 fi
 
 bundle_install_dirs=(

.expeditor/release.omnibus.yml

@@ -10,6 +10,8 @@ builder-to-testers-map:
   el-7-x86_64:
     - el-7-x86_64
     - amazon-2-x86_64
+  rocky-9-x86_64:
+    - rocky-9-x86_64
   sles-12-x86_64:
     - sles-12-x86_64
     - sles-15-x86_64

.expeditor/verify.pipeline.yml

@@ -156,7 +156,8 @@ steps:
 - label: With ChefFS=1
   command:
     - /workdir/scripts/bk_tests/bk_install.sh
-    - gem uninstall bundler -v '>= 2.0.1' -a
+    - gem install bundler -v 2.2.4
+    - gem uninstall bundler -v '> 2.2.4' -a
     - cp scripts/bk_tests/chef_zero-Gemfile oc-chef-pedant/Gemfile
     - bundle install --jobs=3 --retry=3 --path=/workdir/vendor/bundle
     - cd /workdir/oc-chef-pedant

CHANGELOG.md

@@ -1,9 +1,21 @@
 # Chef Server Changelog
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release -->
+<!-- latest_release 15.9.25 -->
+## [15.9.25](https://github.com/chef/chef-server/tree/15.9.25) (2024-03-11)
+
+#### Merged Pull Requests
+- Added rocky9 to infra-server with latest omnibus version [#3720](https://github.com/chef/chef-server/pull/3720) ([muthuja](https://github.com/muthuja))
 <!-- latest_release -->
 
-<!-- release_rollup -->
+<!-- release_rollup since=15.9.20 -->
+### Changes since 15.9.20 release
+
+#### Merged Pull Requests
+- Added rocky9 to infra-server with latest omnibus version [#3720](https://github.com/chef/chef-server/pull/3720) ([muthuja](https://github.com/muthuja)) <!-- 15.9.25 -->
+- Bump open search version to 1.3.14 [#3785](https://github.com/chef/chef-server/pull/3785) ([sreepuramsudheer](https://github.com/sreepuramsudheer)) <!-- 15.9.24 -->
+- Rubyracer fixing for verify pipeline. [#3787](https://github.com/chef/chef-server/pull/3787) ([sreepuramsudheer](https://github.com/sreepuramsudheer)) <!-- 15.9.23 -->
+- updating license scout to fix readme.md it gist [#3776](https://github.com/chef/chef-server/pull/3776) ([sean-simmons-progress](https://github.com/sean-simmons-progress)) <!-- 15.9.22 -->
+- testing adding this gpg key [#3778](https://github.com/chef/chef-server/pull/3778) ([sean-simmons-progress](https://github.com/sean-simmons-progress)) <!-- 15.9.21 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->

README.md

@@ -137,5 +137,5 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License. 
 ```

VERSION

@@ -1 +1 @@
-15.9.20
+15.9.25

oc-chef-pedant/Rakefile

@@ -24,6 +24,12 @@ def bundle_exec_with_chef(test_gem, commands)
         next
       elsif line =~ /^\s*dev_gem\s*['"](.+)['"]\s*$/
         line = "gem '#{$1}', github: 'poise/#{$1}'"
+      # TODO: one of workaround to fix verify pipeline failure
+      # Could not found another way to update chef version without releasing new chef-zero  gem
+      elsif line =~ /^\s*gem\s*['"]chef['"]\s*,?.*$/ # foodcritic      end
+        line = "gem \"chef\", \"17.10.0\""
+      elsif line =~ /^\s*gem\s*['"]ohai['"]\s*,?.*$/ # foodcritic      end
+        line = "gem \"ohai\", \"~> 17.0\""
       elsif line =~ /\s*gem\s*['"]#{test_gem}['"]/ # foodcritic      end
         next
       end

omnibus/config/software/opensearch.rb

@@ -15,7 +15,7 @@
 #
 
 name "opensearch"
-default_version "1.3.7"
+default_version "1.3.14"
 
 dependency "server-open-jre"
 
@@ -55,6 +55,11 @@
          sha256: "541a371f71d6df7bfb643832c8c1291180d082918623987de00b67d0c560a8fa"
 end
 
+version "1.3.14" do
+  source url: "https://artifacts.opensearch.org/releases/bundle/opensearch/#{version}/opensearch-#{version}-linux-x64.tar.gz",
+         sha256: "5d7c0188a393d5d9035e5e81f03bcd00be76e3702750b43b2231a2f428c3187e"
+end
+
 target_path = "#{install_dir}/embedded/opensearch"
 
 build do

scripts/bk_tests/bk_install.sh

@@ -9,8 +9,8 @@ set -e
 # The fix:
 # 1. Add `deb https://apt-archive.postgresql.org/pub/repos/apt bionic-pgdg main` to sources.list
 # 2. Remove /etc/apt/sources.list.d/pgdg.list
-sudo echo "deb https://apt-archive.postgresql.org/pub/repos/apt bionic-pgdg main">>/etc/apt/sources.list
-rm /etc/apt/sources.list.d/pgdg.list
+sudo echo "deb https://apt.postgresql.org/pub/repos/apt/ focal-pgdg main 13">>/etc/apt/sources.list
+rm -f /etc/apt/sources.list.d/pgdg.list
 
 echo "Removing postgresql-9.3"
 apt-get --purge remove -y postgresql-9.3

scripts/bk_tests/chef_zero-Gemfile

@@ -7,6 +7,7 @@ gem 'pry-byebug'
 gem 'pry-stack_explorer'
 gem 'rake'
 
+gem 'chef',  "17.10.0"
 # For "rake chef_zero_spec"
 gem 'chef-zero', github: 'chef/chef-zero', tag: 'v15.0.11'
 

src/oc-id/Gemfile

@@ -19,7 +19,6 @@ gem 'mixlib-authentication', '>= 2.1', '< 4'
 gem 'responders', '~> 3.0', '>= 3.0.1'
 gem 'doorkeeper', '~> 5.0'
 gem "sprockets-rails", ">= 3.4.2"
-gem 'therubyracer', '~> 0.12.3'
 gem 'bigdecimal', '3.1.3'
 gem 'veil', '~> 0.3.11'
 

src/oc-id/Gemfile.lock

@@ -282,7 +282,6 @@ GEM
     json (2.6.3)
     jwt (2.7.0)
     kgio (2.11.4)
-    libv8 (3.16.14.19)
     libyajl2 (2.1.0)
     license-acceptance (2.1.13)
       pastel (~> 0.7)
@@ -315,7 +314,6 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.4)
     minitest (5.18.0)
     mixlib-archive (1.1.7)
       mixlib-log
@@ -427,7 +425,6 @@ GEM
     rb-readline (0.5.5)
     rdoc (6.5.0)
       psych (>= 4.0.0)
-    ref (2.0.0)
     regexp_parser (2.8.1)
     responders (3.1.0)
       actionpack (>= 5.2)
@@ -507,9 +504,6 @@ GEM
     strings-ansi (0.2.0)
     syslog-logger (1.6.8)
     temple (0.10.0)
-    therubyracer (0.12.3)
-      libv8 (~> 3.16.14.15)
-      ref
     thin (1.8.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
@@ -633,7 +627,6 @@ DEPENDENCIES
   spring
   spring-commands-rspec
   sprockets-rails (>= 3.4.2)
-  therubyracer (~> 0.12.3)
   thor (~> 1.2)
   timecop
   turbolinks (~> 5)