Merge pull request #69 from OpenVoxProject/gh-64-revert-pr-65

Gh 64 revert pr 65

Author: jpartlow

.github/workflows/acceptance.yaml

@@ -31,7 +31,12 @@ on:
         description: '(Version) Package version to test. (required if Pre-release Build is true)'
         type: string
       collection:
-        description: '(Collection) OpenVox collection to use. (ignored if Pre-release Build is true)'
+        description: |-
+          (Collection) OpenVox collection to use. (ignored if Pre-release Build is true)
+
+          NOTE: This should really only be set to openvox8 when
+          testing the main branch. If you need to test openvox7, you
+          should run the pipeline from the 7.x branch instead.
         default: 'openvox8'
         type: string
       artifacts-url:

acceptance/tests/validate_vendored_openssl.rb

@@ -19,15 +19,9 @@ def create_bat_wrapper(host, file, command)
   agents.each do |agent|
     openssl = openssl_command(agent)
 
-    puppet_version = on(agent, puppet('--version')).stdout.chomp
-    expected_openssl = case puppet_version
-                       when /^7\./ then 1
-                       else 3
-                       end
-
     step "check openssl version" do
       on(agent, "#{openssl} version -v") do |result|
-        assert_match(/^OpenSSL #{expected_openssl}\./, result.stdout)
+        assert_match(/^OpenSSL 3\./, result.stdout)
       end
     end
 

acceptance/tests/validate_vendored_ruby.rb

@@ -21,10 +21,7 @@ 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)
-
-  puppet_version = on(agent, puppet('--version')).stdout.chomp
-  rubygems_version = ((agent['platform'] =~ /aix-7\.2/) ||
-                      (puppet_version =~ /^7\./)) ? '3.4.22' : ''
+  rubygems_version = agent['platform'] =~ /aix-7\.2/ ? '3.4.22' : ''
   on(agent, "#{gem_command(agent)} update --system #{rubygems_version}")
 
   case agent['platform']