Fixing errors.

Added step to install bundler 2.2.4. Remove v8 and rubyracer There doesn't seem to be any use of that library in OC-ID or its tests, so let's see how it behaves without it. Signed-off-by: Marc A. Paradise <[email protected]> Signed-off-by: sreepuramsudheer <[email protected]>
chef · Mar 4, 2024 · dfc339b · dfc339b
1 parent 6750ec4
commit dfc339b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/.expeditor/license_scout.sh b/.expeditor/license_scout.sh
@@ -25,7 +25,8 @@ if [[ "${BUILDKITE:-false}" == "true" ]]; then
   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
+  gem info psych
 fi
 
 bundle_install_dirs=(

diff --git a/.expeditor/verify.pipeline.yml b/.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

diff --git a/scripts/bk_tests/bk_install.sh b/scripts/bk_tests/bk_install.sh
@@ -10,7 +10,7 @@ set -e
 # 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.postgresql.org/pub/repos/apt/ focal-pgdg main 13">>/etc/apt/sources.list
-rm /etc/apt/sources.list.d/pgdg.list
+rm -f /etc/apt/sources.list.d/pgdg.list
 
 echo "Removing postgresql-9.3"
 apt-get --purge remove -y postgresql-9.3

diff --git a/src/oc-id/Gemfile b/src/oc-id/Gemfile
@@ -19,9 +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 "libv8-node"
-gem "mini_racer"
 gem 'bigdecimal', '3.1.3'
 gem 'veil', '~> 0.3.11'
 

diff --git a/src/oc-id/Gemfile.lock b/src/oc-id/Gemfile.lock
@@ -284,7 +284,6 @@ GEM
     jwt (2.8.0)
       base64
     kgio (2.11.4)
-    libv8-node (18.16.0.0-x86_64-linux)
     libyajl2 (2.1.0)
     license-acceptance (2.1.13)
       pastel (~> 0.7)
@@ -317,8 +316,6 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.5)
-    mini_racer (0.8.0)
-      libv8-node (~> 18.16.0.0)
     minitest (5.22.2)
     mixlib-archive (1.1.7)
       mixlib-log
@@ -517,7 +514,7 @@ GEM
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    thor (1.3.0)
+    thor (1.3.1)
     tilt (2.3.0)
     timecop (0.9.8)
     timeout (0.4.1)
@@ -619,9 +616,7 @@ DEPENDENCIES
   jbuilder (~> 2.11)
   jquery-rails
   jwt
-  libv8-node
   mailcatcher
-  mini_racer
   mixlib-authentication (>= 2.1, < 4)
   nokogiri (= 1.14.3)
   omniauth-chef (~> 0.4)