Merge pull request #92 from puppetlabs/maint/main/pin-orchestrator

(maint) Update Gems

Author: joshcooper

.sync.yml

@@ -34,15 +34,16 @@ Gemfile:
         version: '~> 2'
       - gem: beaker-rspec
         from_env: BEAKER_RSPEC_VERSION
-      # Prevent beaker-puppet from being installed on Ruby > 3.1 until beaker-puppet supports newer Rubies
       - gem: beaker-puppet
         from_env: BEAKER_PUPPET_VERSION
         version: '~> 4.0'
-        condition: Gem::Requirement.create('< 3.2.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-      - gem: async
-        version: '~> 1'
       - gem: beaker-module_install_helper
       - gem: nokogiri
+      # Conflicting Faraday requirements cause unexpected dependency resolution
+      # Pin orchestrator_client until all dependencies support Faraday >= 2
+      # See: P4DEVOPS-8804
+      - gem: 'orchestrator_client'
+        version: '< 0.7.1'
     ":system_tests":
       - gem: voxpupuli-acceptance
 

Gemfile

@@ -61,22 +61,22 @@ group :development do
   gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 1.0')
   gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '~> 2')
   gem "beaker-rspec"
-  gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 4.0') if Gem::Requirement.create('< 3.2.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "async", '~> 1',                                                                     require: false
+  gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 4.0')
   gem "beaker-module_install_helper",                                                      require: false
   gem "nokogiri",                                                                          require: false
+  gem "orchestrator_client", '< 0.7.1',                                                    require: false
 end
 group :development, :release_prep do
   gem "puppet-strings", '~> 4.0',         require: false
   gem "puppetlabs_spec_helper", '~> 8.0', require: false
   gem "puppet-blacksmith", '~> 7.0',      require: false
 end
 group :system_tests do
-  gem "puppet_litmus", '~> 2.0',        require: false, platforms: [:ruby, :x64_mingw] if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
-  gem "puppet_litmus", '~> 1.0',        require: false, platforms: [:ruby, :x64_mingw] if ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
-  gem "CFPropertyList", '< 3.0.7',      require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "serverspec", '~> 2.41',          require: false
-  gem "voxpupuli-acceptance", '~> 3.2', require: false
+  gem "puppet_litmus", '~> 2.0',   require: false, platforms: [:ruby, :x64_mingw] if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
+  gem "puppet_litmus", '~> 1.0',   require: false, platforms: [:ruby, :x64_mingw] if ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
+  gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "serverspec", '~> 2.41',     require: false
+  gem "voxpupuli-acceptance",      require: false
 end
 
 gems = {}