Skip to content

Commit

Permalink
Merge pull request #2457 from joshcooper/skip_aix72
Browse files Browse the repository at this point in the history
Use older rubygems-update on AIX 7.2
  • Loading branch information
joshcooper authored Jan 3, 2024
2 parents 0ec7070 + d8b2651 commit 5e2a083
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions acceptance/tests/validate_vendored_ruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ def setup_build_environment(agent)
# We add `--enable-system-libraries` to use system libsqlite3
gem_install_sqlite3 = "env GEM_HOME=/opt/puppetlabs/puppet/lib/ruby/vendor_gems " + gem_command(agent) + " install sqlite3 -- --enable-system-libraries"
install_package_on_agent = package_installer(agent)
on(agent, "#{gem_command(agent)} update --system")
rubygems_version = agent['platform'] =~ /aix-7\.2/ ? '3.4.22' : ''
on(agent, "#{gem_command(agent)} update --system #{rubygems_version}")

case agent['platform']
when /aix/
Expand Down Expand Up @@ -155,7 +156,8 @@ def install_dependencies(agent)
agents_to_skip = select_hosts({:platform => [/windows/, /cisco/, /eos/, /cumulus/]}, agents)
agents_to_test = agents - agents_to_skip
agents_to_test.each do |agent|
on(agent, "/opt/puppetlabs/puppet/bin/gem update --system")
rubygems_version = agent['platform'] =~ /aix-7\.2/ ? '3.4.22' : ''
on(agent, "/opt/puppetlabs/puppet/bin/gem update --system #{rubygems_version}")
list_env = on(agent, "/opt/puppetlabs/puppet/bin/gem env").stdout.chomp
unless list_env.include?("/opt/puppetlabs/puppet/lib/ruby/vendor_gems")
fail_test("Failed to keep vendor_gems directory in GEM_PATH!")
Expand Down

0 comments on commit 5e2a083

Please sign in to comment.