[WIP]CHEF-12767 Upgrade oc-id to LTS channel

.expeditor/automate_build.sh

@@ -11,13 +11,16 @@ export HAB_STUDIO_SECRET_HAB_FEAT_IGNORE_LOCAL=false
 export HAB_FEAT_IGNORE_LOCAL=false
 export HAB_STUDIO_HOST_ARCH=x86_64-linux
 export HAB_FEAT_OFFLINE_INSTALL=true
+export HAB_BLDR_CHANNEL="LTS-2024"
+export HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL="LTS-2024"
+export HAB_FALLBACK_CHANNEL="LTS-2024"
 
 curl https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.sh | sudo bash
 
-sudo -E hab pkg install core/ruby
+sudo -E hab pkg install  core/ruby3_4
 export PATH
-PATH="$(hab pkg path core/ruby)/bin:$PATH"
-sudo -E "$(hab pkg path core/ruby)"/bin/gem install toml
+PATH="$(hab pkg path core/ruby3_4)/bin:$PATH"
+sudo -E "$(hab pkg path core/ruby3_4)"/bin/gem install toml
 
 export JOB_TEMP_ROOT
 JOB_TEMP_ROOT=$(mktemp -d /tmp/job-root-XXXXXX)
@@ -42,10 +45,11 @@ 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
+git checkout dave/LTS-channel # this is the branch that has the changes for LTS channel
+# if [ "${AUTOMATE_BRANCH}" != "" ]
+# then
+#   git checkout "${AUTOMATE_BRANCH}"
+# fi
 
 RESOLVED_RESULTS_DIR=$(realpath results/)
 export DO_CHECK=true
@@ -75,7 +79,7 @@ HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CA
 .expeditor/create-manifest.rb
 mv manifest.json results/build.json
 
-HAB_PKG_CHANNEL=unstable NO_PIN_HAB=true .expeditor/create-manifest.rb
+HAB_PKG_CHANNEL=LTS-2024 NO_PIN_HAB=true .expeditor/create-manifest.rb
 mv manifest.json results/build-habdev.json
 
 echo "after build" `ls -l results`

.expeditor/build.habitat.yml

@@ -1,4 +1,17 @@
 ---
+env:
+  HAB_BLDR_CHANNEL: "LTS-2024"
+  HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
+  HAB_FALLBACK_CHANNEL: "LTS-2024"
 
 origin: chef
 smart_build: false
+studio_secrets:
+  HAB_BLDR_CHANNEL:
+    value: "LTS-2024"
+  HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL:
+    value: "LTS-2024"
+  HAB_FALLBACK_CHANNEL:
+    value: "LTS-2024"
+
+

.expeditor/config.yml

@@ -129,3 +129,4 @@ artifact_channels:
   - unstable
   - current
   - stable
+  - LTS-2024

.expeditor/license_scout.sh

@@ -32,11 +32,15 @@ bundle_install_dirs=(
   chef-server-ctl
   oc-id
 )
+echo "+++ Using Ruby version: $(ruby -v)"
 
 for dir in "${bundle_install_dirs[@]}"; do
   echo "--- Installing gem dependencies for $dir"
   pushd "src/$dir"
-    bundle install --jobs=3 --retry=3 --path=/workdir/vendor/bundle
+    bundle config set jobs 3
+    bundle config set retry 3
+    bundle config set path "/workdir/vendor/bundle"
+    bundle install 
   popd
 done
 

.github/workflows/brakeman-analysis.yml

@@ -31,7 +31,7 @@ jobs:
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0'
+        ruby-version: '3.1.6'
 
     - name: Setup Brakeman
       env:

.license_scout.yml

@@ -15,7 +15,7 @@ habitat:
     - origin: chef
       channel: unstable
     - origin: core
-      channel: stable
+      channel: LTS-2024
 
 allowed_licenses:
   - Apache-1.0
@@ -205,8 +205,12 @@ exceptions:
       reason: Exception made by Chef Legal
     - name: core/rsync
       reason: Exception made by Chef Legal
-    - name: core/ruby
+    - name:  core/ruby31/3.1.6/20240912144513
       reason: Exception made by Chef Legal
+    - name: core/ruby3_1
+      reason: Ruby license
+    - name: core/ruby3_4
+      reason: Ruby license
     - name: core/sed
       reason: Exception made by Chef Legal
     - name: core/sqitch_pg
@@ -215,4 +219,19 @@ exceptions:
       reason: Exception made by Chef Legal
     - name: core/xz
       reason: Exception made by Chef Legal
+    - name: core/acl
+      reason: Exception made by Chef Legal
+    - name: core/cpanminus
+      reason: Exception made by Chef Legal
+    - name : core/libidn2
+      reason: Exception made by Chef Legal
+    - name : core/libunistring
+      reason: Exception made by Chef Legal
+    - name : core/ncurses
+      reason: Exception made by Chef Legal
+    - name: core/sqlite
+      reason: Exception made by Chef Legal
+    - name : core/tzdata
+      reason: Exception made by Chef Legal
+
 

scripts/bk_tests/bk_install.sh

@@ -51,7 +51,7 @@ asdf local erlang 24.3.2
 erl -eval 'erlang:display(erlang:system_info(otp_release)), halt().' -noshell
 
 echo "Installing Bundler"
-gem install bundler --version '~> 1.17' --no-document
+gem install bundler --version '~> 2.1' --no-document
 
 echo "Installing Lua"
 export LUALIB=~/.luarocks/lib/lua/5.2

src/oc-id/Gemfile

@@ -3,7 +3,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 7.0.8.1'
-gem 'chef', '17.10.0'
+gem 'chef', '17.10.163'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.11'
 gem 'jquery-rails'
@@ -21,6 +21,8 @@ gem 'doorkeeper', '~> 5.0'
 gem "sprockets-rails", ">= 3.4.2"
 gem 'bigdecimal', '3.1.3'
 gem 'veil', '~> 0.3.11'
+gem 'syslog'
+gem 'mutex_m'
 
 gem 'omniauth-chef', '~> 0.4'
 gem 'tzinfo-data'