From 8079e56b35455bda3e9873c9e1355f548fb416d8 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Mon, 27 Jan 2025 16:30:00 +0100 Subject: [PATCH] run-basic-rails-application: Remove a logic installing upstream rails gem. Remove a logic installing upstream rails gem which is executed if Rails RPM is not installed. The logic is for CentOS Stream where Rails RPM may not be installed. However, as there is the tests/ruby repository for CentOS Stream,[1] we don't have to manage CentOS Stream specific logic in Fedora tests/ruby repository. [1] https://gitlab.com/redhat/centos-stream/tests/ruby --- run-basic-rails-application/runtest.sh | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/run-basic-rails-application/runtest.sh b/run-basic-rails-application/runtest.sh index 21e6b16..6fc3d6f 100755 --- a/run-basic-rails-application/runtest.sh +++ b/run-basic-rails-application/runtest.sh @@ -32,10 +32,6 @@ PACKAGES=${PACKAGES:-ruby rubygems rubypick} REQUIRES=${REQUIRES:-} RUBY=${RUBY:-ruby} -RAILS=0 -bundle="" -ARCH=$(uname -m) -RAILSVER="" rlJournalStart rlPhaseStartSetup @@ -44,20 +40,6 @@ rlJournalStart rlAssertBinaryOrigin "gem" rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "pushd $TmpDir" - - # install rails and nokogiri from gem if not found in installation - if ! gem list "^rails *$" -i - then - # nokogiri gem installed with rails needs to use system libraries - # on arm and ppcle otherwise it fails with bundled libraries - if [ "x$ARCH" = "xaarch64" ] || [ "x$ARCH" = "xppc64le" ] - then - export NOKOGIRI_USE_SYSTEM_LIBRARIES=yes - fi - rlRun "gem install nokogiri $NOKOVER --no-document" 0 "Installing nokogiri $NOKOVER without documentation" - rlRun "gem install rails $RAILSVER --no-document" 0 "Installing rails $RAILSVER without documentation" - RAILS=1 - fi rlPhaseEnd rlPhaseStartTest @@ -74,7 +56,6 @@ rlJournalStart rlPhaseStartCleanup rlRun "popd; popd" - [ $RAILS == 1 ] && rlRun "gem uninstall rails nokogiri minitest -a -I -x" 0 "Removing rails and nokogiri gem" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd rlJournalPrintText