no message

Author: david22swan

spec/spec_helper_acceptance_local.rb

@@ -29,12 +29,12 @@ class Helper
 
     if ENV['GITHUB_ACTIONS'] == 'true'
       Helper.instance.run_shell("gsutil -q cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{WIN_2012R2_ISO} C:/Windows/Temp/#{WIN_2012R2_ISO}")
-      # iso_opts = {
-      #   folder: 'C:/Windows/Temp',
-      #   file: WIN_2012R2_ISO,
-      #   drive_letter: 'I',
-      # }
-      # mount_iso(iso_opts)
+      iso_opts = {
+        folder: 'C:/Windows/Temp',
+        file: WIN_2012R2_ISO,
+        drive_letter: 'I',
+      }
+      mount_iso(iso_opts)
 
       # Temp fix to prove code works
       base_install('2016', 'C:/Windows/Temp')
@@ -105,61 +105,48 @@ def mount_iso(opts = {})
 end
 
 def base_install(sql_version, resource_root)
-  i_iso_opts = {
-    folder: 'C:/Windows/Temp',
-    file: WIN_2012R2_ISO,
-    drive_letter: 'I',
-  }
-  mount_iso(i_iso_opts)
-
   case sql_version.to_i
   when 2012
     Helper.instance.run_shell("gsutil -q cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{SQL_2012_ISO} C:/Windows/Temp/#{SQL_2012_ISO}") if ENV['GITHUB_ACTIONS'] == 'true'
-    h_iso_opts = {
+    iso_opts = {
       folder: resource_root,
       file: SQL_2012_ISO,
       drive_letter: 'H',
     }
   when 2014
     Helper.instance.run_shell("gsutil -q cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{SQL_2014_ISO} C:/Windows/Temp/#{SQL_2014_ISO}") if ENV['GITHUB_ACTIONS'] == 'true'
-    h_iso_opts = {
+    iso_opts = {
       folder: resource_root,
       file: SQL_2014_ISO,
       drive_letter: 'H',
     }
   when 2016
     Helper.instance.run_shell("gsutil -q cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{SQL_2016_ISO} C:/Windows/Temp/#{SQL_2016_ISO}") if ENV['GITHUB_ACTIONS'] == 'true'
-    h_iso_opts = {
+    iso_opts = {
       folder: resource_root,
       file: SQL_2016_ISO,
       drive_letter: 'H',
     }
   when 2017
     Helper.instance.run_shell("gsutil -q cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{SQL_2017_ISO} C:/Windows/Temp/#{SQL_2017_ISO}") if ENV['GITHUB_ACTIONS'] == 'true'
-    h_iso_opts = {
+    iso_opts = {
       folder: resource_root,
       file: SQL_2017_ISO,
       drive_letter: 'H',
     }
   when 2019
     Helper.instance.run_shell("gsutil -q cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{SQL_2019_ISO} C:/Windows/Temp/#{SQL_2019_ISO}") if ENV['GITHUB_ACTIONS'] == 'true'
-    h_iso_opts = {
+    iso_opts = {
       folder: resource_root,
       file: SQL_2019_ISO,
       drive_letter: 'H',
     }
   end
   # Mount the ISO on the agent
-  mount_iso(h_iso_opts)
+  mount_iso(iso_opts)
   # Install Microsoft SQL on the agent before running any tests
   features = ['DQ', 'FullText', 'Replication', 'SQLEngine']
   install_sqlserver(features)
-
-  reboot()
-  # Remount the ISO on the agent
-  mount_iso(i_iso_opts)
-  mount_iso(h_iso_opts)
-  install_sqlserver(features)
 end
 
 def install_sqlserver(features)
@@ -183,12 +170,7 @@ def install_sqlserver(features)
       windows_feature_source => 'I:\\sources\\sxs',
     }
     MANIFEST
-  Helper.instance.apply_manifest(pp)
-end
-
-def reboot()
-  # Call the reboot plan
-  system("bundle exec bolt --modulepath ./spec/fixtures/modules/ -i spec/fixtures/litmus_inventory.yaml plan run reboot targets='#{ENV['TARGET_HOST']}' reconnect_timeout=300")
+  Helper.instance.apply_manifest(pp, catch_failures: true)
 end
 
 def run_sql_query(opts = {}, &block)