Merge 7.x into main

puppetlabs · Apr 1, 2024 · d2c5b4e · d2c5b4e
2 parents 2a40901 + b8467b2
commit d2c5b4e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/acceptance/helper.rb b/acceptance/helper.rb
@@ -858,6 +858,8 @@ def install_puppet_from_package(puppet_collection = "puppet6")
       # Take new configuration file on debian to prevent tests from hanging
       # when this is used to upgrade puppet
       if get_os_family(database) == :debian
+        # Explicitly install ca-certificates-java before java to avoid error installing java on debian
+        database.install_package('ca-certificates-java')
         database.install_package('puppetserver', '-o Dpkg::Options::="--force-confnew"')
       else
         install_package(database, 'puppetserver')