Upgrading chef server components with the latest version (#6183)

* upgrading chef server components to latest 14.11.36 version Signed-off-by: Vinay Satish <vinay.satish@progress.com> * skip response_headers test for server pedant test as the chef-server-running.json is not present in the automate environment Signed-off-by: Vinay Satish <vinay.satish@progress.com> * Updated ruby27 in automate-cs-nginx and oc_erchef run hook for fixing the chef-server-ctl issues Signed-off-by: jan shahid shaik <jashaik@progress.com> Signed-off-by: Kallol Roy <karoy@progress.com> Signed-off-by: Prajakta Purohit <prajakta@chef.io> * increse timeout Signed-off-by: Vivek Shankar <vshankar@progress.com> Co-authored-by: jan shahid shaik <jashaik@progress.com> Co-authored-by: Vivek Shankar <vshankar@progress.com>
chef · Dec 29, 2021 · 6c5151a · 6c5151a
1 parent ce887f6
commit 6c5151a
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 21 deletions.
diff --git a/.expeditor/verify_private.pipeline.yml b/.expeditor/verify_private.pipeline.yml
@@ -566,7 +566,7 @@ steps:
   - label: "a1migration"
     command:
       - integration/run_test integration/tests/a1migration.sh
-    timeout_in_minutes: 20
+    timeout_in_minutes: 30
     expeditor:
       executor:
         linux:

diff --git a/.license_scout.yml b/.license_scout.yml
@@ -308,6 +308,9 @@ fallbacks:
     - name: core/ruby26
       license_id: BSD-2-Clause
       license_content: https://raw.githubusercontent.com/ruby/ruby/trunk/COPYING
+    - name: core/ruby27
+      license_id: BSD-2-Clause
+      license_content: https://raw.githubusercontent.com/ruby/ruby/trunk/COPYING
     - name: core/cacerts
       license_id: MPL-2.0
       license_content: https://curl.haxx.se/docs/caextract.html
@@ -459,6 +462,8 @@ exceptions:
       reason:  Exception made by Chef Legal
     - name: core/ruby30
       reason: Ruby license (previously shipped in Automate 1)
+    - name: core/ruby27
+      reason:  Exception made for chef server upgrade
 
 
   ruby:

diff --git a/components/automate-cs-bookshelf/habitat/plan.sh b/components/automate-cs-bookshelf/habitat/plan.sh
@@ -6,7 +6,7 @@ pkg_name="automate-cs-bookshelf"
 pkg_description="Wrapper package for chef/bookshelf"
 pkg_origin="chef"
 # WARNING: Version managed by .expeditor/update_chef_server.sh
-pkg_version="14.4.4"
+pkg_version="14.11.36"
 vendor_origin="chef"
 pkg_maintainer="Chef Software Inc. <support@chef.io>"
 pkg_license=("Chef-MLSA")
@@ -15,7 +15,7 @@ pkg_deps=(
   chef/mlsa
   "${local_platform_tools_origin:-chef}/automate-platform-tools"
   # WARNING: Version pin managed by .expeditor/update_chef_server.sh
-  "${vendor_origin}/bookshelf/14.4.4/20210520120637"
+  "${vendor_origin}/bookshelf/14.11.36/20211227114241"
 )
 
 pkg_binds=(

diff --git a/components/automate-cs-nginx/habitat/plan.sh b/components/automate-cs-nginx/habitat/plan.sh
@@ -7,7 +7,7 @@ vendor_origin="chef"
 pkg_maintainer="Chef Software Inc. <support@chef.io>"
 pkg_license=('Chef-MLSA')
 # WARNING: Version managed by .expeditor/update_chef_server.sh
-pkg_version="14.4.4"
+pkg_version="14.11.36"
 pkg_deps=(
   core/coreutils
   chef/mlsa
@@ -18,10 +18,10 @@ pkg_deps=(
   # chef-server-* packages.
   #
   core/curl/7.68.0/20200601114640
-  core/ruby26/2.6.5/20200404043345
+  core/ruby27/2.7.0/20200404045319
   # WARNING: Version pin managed by .expeditor/update_chef_server.sh
-  "${vendor_origin}/chef-server-nginx/14.4.4/20210520121142"
-  "${vendor_origin}/chef-server-ctl/14.4.4/20210520120637"
+  "${vendor_origin}/chef-server-nginx/14.11.36/20211227114734"
+  "${vendor_origin}/chef-server-ctl/14.11.36/20211227114241"
 )
 
 pkg_bin_dirs=(bin)
@@ -63,7 +63,7 @@ scaffolding_go_binary_list=(
 chef_automate_hab_binding_mode="relaxed"
 
 do_prepare() {
-  GO_LDFLAGS="-X main.RubyPath=$(pkg_path_for core/ruby26)"
+  GO_LDFLAGS="-X main.RubyPath=$(pkg_path_for core/ruby27)"
   GO_LDFLAGS="$GO_LDFLAGS -X main.ChefServerCtlPath=$(pkg_path_for chef/chef-server-ctl)"
   GO_LDFLAGS="$GO_LDFLAGS -X main.KnifePath=${pkg_prefix}/bin/knife"
   GO_LDFLAGS="$GO_LDFLAGS -X main.Version=${pkg_version}/${pkg_release}"
@@ -79,5 +79,5 @@ do_install() {
   install "$PLAN_CONTEXT/bin/knife" "$wrapper_bin_path/knife"
 
   sed -i "s!__BUILDTIME_HAB_PKG_PATH_CHEF_SERVER_CTL__!$(pkg_path_for chef/chef-server-ctl)!g" "$wrapper_bin_path/knife"
-  sed -i "s!__BUILDTIME_HAB_PKG_PATH_RUBY__!$(pkg_path_for core/ruby26)!g" "$wrapper_bin_path/knife"
+  sed -i "s!__BUILDTIME_HAB_PKG_PATH_RUBY__!$(pkg_path_for core/ruby27)!g" "$wrapper_bin_path/knife"
 }
diff --git a/components/automate-cs-oc-bifrost/habitat/plan.sh b/components/automate-cs-oc-bifrost/habitat/plan.sh
@@ -6,7 +6,7 @@ pkg_name="automate-cs-oc-bifrost"
 pkg_description="Wrapper package for chef/oc_bifrost"
 pkg_origin="chef"
 # WARNING: Version managed by .expeditor/update_chef_server.sh
-pkg_version="14.4.4"
+pkg_version="14.11.36"
 vendor_origin="chef"
 pkg_maintainer="Chef Software Inc. <support@chef.io>"
 pkg_license=("Chef-MLSA")
@@ -15,7 +15,7 @@ pkg_deps=(
   chef/mlsa
   "${local_platform_tools_origin:-chef}/automate-platform-tools"
   # WARNING: Version pin managed by .expeditor/update_chef_server.sh
-  "${vendor_origin}/oc_bifrost/14.4.4/20210520120641"
+  "${vendor_origin}/oc_bifrost/14.11.36/20211227114250"
 )
 
 pkg_binds=(

diff --git a/components/automate-cs-oc-erchef/habitat/hooks/run b/components/automate-cs-oc-erchef/habitat/hooks/run
@@ -49,7 +49,7 @@ HOME="{{pkg.svc_data_path}}" BUNDLE_GEMFILE="{{pkgPathFor "chef/oc_erchef"}}/Gem
     bundle exec ruby "{{pkg.svc_config_path}}/chef_server_data_bootstrap.rb"
 
 # ruby vars are needed in order to make depselector start up
-export PATH={{pkgPathFor "core/ruby26"}}/bin:${PATH}
+export PATH={{pkgPathFor "core/ruby27"}}/bin:${PATH}
 export LD_LIBRARY_PATH={{pkgPathFor "core/libffi"}}/lib:${LD_LIBRARY_PATH}
 export GEM_HOME={{pkgPathFor "chef/oc_erchef"}}/vendor/bundle
 export GEM_PATH={{pkgPathFor "chef/oc_erchef"}}/vendor/bundle

diff --git a/components/automate-cs-oc-erchef/habitat/plan.sh b/components/automate-cs-oc-erchef/habitat/plan.sh
@@ -6,7 +6,7 @@ pkg_name="automate-cs-oc-erchef"
 pkg_description="Wrapper package for chef/oc_erchef"
 pkg_origin="chef"
 # WARNING: Version managed by .expeditor/update_chef_server.sh
-pkg_version="14.4.4"
+pkg_version="14.11.36"
 vendor_origin="chef"
 pkg_maintainer="Chef Software Inc. <support@chef.io>"
 pkg_license=("Chef-MLSA")
@@ -16,7 +16,7 @@ pkg_deps=(
   chef/mlsa
   "${local_platform_tools_origin:-chef}/automate-platform-tools"
   # WARNING: Version pin managed by .expeditor/update_chef_server.sh
-  "${vendor_origin}/oc_erchef/14.4.4/20210520120641"
+  "${vendor_origin}/oc_erchef/14.11.36/20211227114250"
 )
 
 pkg_build_deps=(

diff --git a/integration/tests/a1migration.sh b/integration/tests/a1migration.sh
@@ -46,7 +46,7 @@ do_test_deploy() {
     chef_server_migration_smoke_tests
     ## skipping status test because of the missing file in automate - /etc/opscode/chef-server-running.json 
     ## adding smoke tag or else all the test will be considered skipping only the status test
-    PATH="/hab/bin:/bin" chef-server-ctl test --smoke --skip-status
+    PATH="/hab/bin:/bin" chef-server-ctl test --smoke --skip-status --skip=response_headers
 
     workflow_server_migration_smoke_tests
 }

diff --git a/integration/tests/chef_server.sh b/integration/tests/chef_server.sh
@@ -55,7 +55,7 @@ do_test_deploy() {
     umask 022
     ## skipping status test because of the missing file in automate - /etc/opscode/chef-server-running.json 
     ## adding smoke tag or else all the test will be considered skipping only the status test
-    PATH="/hab/bin:/bin" chef-server-ctl test --smoke --skip-status
+    PATH="/hab/bin:/bin" chef-server-ctl test --smoke --skip-status --skip=response_headers
     test_chef_server_ctl
     test_knife
     test_cookbook_caching

diff --git a/integration/tests/chef_server_backup.sh b/integration/tests/chef_server_backup.sh
@@ -29,7 +29,7 @@ do_deploy() {
 do_test_deploy() {
     ## skipping status test because of the missing file in automate - /etc/opscode/chef-server-running.json 
     ## adding smoke tag or else all the test will be considered skipping only the status test
-    PATH="/hab/bin:/bin" chef-server-ctl test --smoke --skip-status
+    PATH="/hab/bin:/bin" chef-server-ctl test --smoke --skip-status --skip=response_headers
     test_chef_server_ctl
     do_test_deploy_default
 }

diff --git a/integration/tests/chef_server_only.sh b/integration/tests/chef_server_only.sh
@@ -32,6 +32,6 @@ do_deploy() {
 do_test_deploy() {
     ## skipping status test because of the missing file in automate - /etc/opscode/chef-server-running.json 
     ## adding smoke tag or else all the test will be considered skipping only the status test
-    PATH="/hab/bin:/bin" chef-server-ctl test --smoke --skip-status
+    PATH="/hab/bin:/bin" chef-server-ctl test --smoke --skip-status --skip=response_headers
     test_chef_server_ctl
 }
diff --git a/integration/tests/chef_server_upgrade.sh b/integration/tests/chef_server_upgrade.sh
@@ -24,7 +24,7 @@ do_deploy() {
 do_test_deploy() {
     ## skipping status test because of the missing file in automate - /etc/opscode/chef-server-running.json 
     ## adding smoke tag or else all the test will be considered skipping only the status test
-    PATH="/hab/bin:/bin" chef-server-ctl test --smoke --skip-status
+    PATH="/hab/bin:/bin" chef-server-ctl test --smoke --skip-status --skip=response_headers
     test_chef_server_ctl
     test_knife
     do_test_deploy_default
@@ -33,7 +33,7 @@ do_test_deploy() {
 do_test_upgrade() {
     ## skipping status test because of the missing file in automate - /etc/opscode/chef-server-running.json 
     ## adding smoke tag or else all the test will be considered skipping only the status test
-    PATH="/hab/bin:/bin" chef-server-ctl test --smoke --skip-status
+    PATH="/hab/bin:/bin" chef-server-ctl test --smoke --skip-status --skip=response_headers
     test_chef_server_ctl
     test_knife
     do_test_upgrade_default

diff --git a/integration/tests/ha_chef_server.sh b/integration/tests/ha_chef_server.sh
@@ -173,7 +173,7 @@ EOH
 do_test_deploy() {
     ## skipping status test because of the missing file in automate - /etc/opscode/chef-server-running.json 
     ## adding smoke tag or else all the test will be considered skipping only the status test
-    hab pkg exec chef/automate-cs-nginx chef-server-ctl test --smoke --skip-status
+    hab pkg exec chef/automate-cs-nginx chef-server-ctl test --smoke --skip-status --skip=response_headers
 }
 
 do_cleanup() {