From 2995e953f448421da1a4263213c9887e953cd4e8 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 13 Apr 2023 12:45:55 +0900 Subject: [PATCH] Stable-only: Pin semantic_puppet in CentOS 8 semantic_puppet >= 1.1.0 requires ruby >= 2.7.0 so can no longer be installed in ruby 2.6.0 in CentOS 8. Backport note: This backport removes the version check, because we run no tests in CentOS 9 in this branch. In addition, distro check is also removed, because the same pin is required in Ubuntu Bionic Closes-Bug: #2016056 Change-Id: Iadff3de808a012c42c2c9a7edb24385c64c7ae78 (cherry picked from commit e3ababb6498e65d1e2ef1d27d1e39a981935463b) (cherry picked from commit e3ababb6498e65d1e2ef1d27d1e39a981935463b) (cherry picked from commit 3f6b89c64b4b996f21d66d92669b4bdb8042efa7) --- install_modules.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/install_modules.sh b/install_modules.sh index 8ba90e56d..12e7346c4 100755 --- a/install_modules.sh +++ b/install_modules.sh @@ -27,16 +27,17 @@ source $SCRIPT_DIR/functions print_header 'Start (install_modules.sh)' print_header 'Install r10k' -if [ "${OS_NAME_VERS}" == "centos8" ]; then - # faraday-net_http >= 3.0.0 supports only Ruby 2.6.0 but CentOS 8 provides - # Ruby 2.5.0 - $GEM_INSTALL_CMD faraday-net_http -v '< 3.0.0' - # Pin a few more packages to avoid updating faraday-net_http - $GEM_INSTALL_CMD faraday -v '< 2.0.0' - $GEM_INSTALL_CMD r10k -v '< 3.15.0' -else - $GEM_INSTALL_CMD r10k -fi +# faraday-net_http >= 3.0.0 requires Ruby >= 2.6.0 +# semantic_puppet >= 1.1.0 requires Ruby >= 2.7.0 +cat </tmp/Gemfile +source 'http://rubygems.org' + +gem 'faraday-net_http', '<3.0.0' +gem 'faraday', '<2.0.0' +gem 'semantic_puppet', '<1.1.0' +gem 'r10k', '<3.15.0' +EOF +$GEM_INSTALL_CMD -g /tmp/Gemfile # make sure there is no puppet module pre-installed rm -rf "${PUPPETFILE_DIR:?}/"*