@@ -29,18 +29,16 @@ class Helper
2929
3030 if ENV [ 'GITHUB_ACTIONS' ] == 'true'
3131 Helper . instance . run_shell ( "gsutil -q cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{ WIN_2012R2_ISO } C:/Windows/Temp/#{ WIN_2012R2_ISO } " )
32- iso_opts = {
33- folder : 'C:/Windows/Temp' ,
34- file : WIN_2012R2_ISO ,
35- drive_letter : 'I' ,
36- }
37- mount_iso ( iso_opts )
32+ # iso_opts = {
33+ # folder: 'C:/Windows/Temp',
34+ # file: WIN_2012R2_ISO,
35+ # drive_letter: 'I',
36+ # }
37+ # mount_iso(iso_opts)
3838
3939 # Temp fix to prove code works
4040 base_install ( '2016' , 'C:/Windows/Temp' )
4141 # base_install(sql_version?, 'C:/Windows/Temp')
42- # Remount the ISO on the agent
43- mount_iso ( iso_opts )
4442 else
4543 # For Internal testing
4644 iso_opts = {
@@ -107,52 +105,61 @@ def mount_iso(opts = {})
107105end
108106
109107def base_install ( sql_version , resource_root )
108+ i_iso_opts = {
109+ folder : 'C:/Windows/Temp' ,
110+ file : WIN_2012R2_ISO ,
111+ drive_letter : 'I' ,
112+ }
113+ mount_iso ( i_iso_opts )
114+
110115 case sql_version . to_i
111116 when 2012
112117 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'
113- iso_opts = {
118+ h_iso_opts = {
114119 folder : resource_root ,
115120 file : SQL_2012_ISO ,
116121 drive_letter : 'H' ,
117122 }
118123 when 2014
119124 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'
120- iso_opts = {
125+ h_iso_opts = {
121126 folder : resource_root ,
122127 file : SQL_2014_ISO ,
123128 drive_letter : 'H' ,
124129 }
125130 when 2016
126131 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'
127- iso_opts = {
132+ h_iso_opts = {
128133 folder : resource_root ,
129134 file : SQL_2016_ISO ,
130135 drive_letter : 'H' ,
131136 }
132137 when 2017
133138 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'
134- iso_opts = {
139+ h_iso_opts = {
135140 folder : resource_root ,
136141 file : SQL_2017_ISO ,
137142 drive_letter : 'H' ,
138143 }
139144 when 2019
140145 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'
141- iso_opts = {
146+ h_iso_opts = {
142147 folder : resource_root ,
143148 file : SQL_2019_ISO ,
144149 drive_letter : 'H' ,
145150 }
146151 end
147152 # Mount the ISO on the agent
148- mount_iso ( iso_opts )
153+ mount_iso ( h_iso_opts )
149154 # Install Microsoft SQL on the agent before running any tests
150155 features = [ 'DQ' , 'FullText' , 'Replication' , 'SQLEngine' ]
151156 install_sqlserver ( features )
152157
153158 reboot ( )
154159 # Remount the ISO on the agent
155- mount_iso ( iso_opts )
160+ mount_iso ( i_iso_opts )
161+ mount_iso ( h_iso_opts )
162+ install_sqlserver ( features )
156163end
157164
158165def install_sqlserver ( features )
0 commit comments