Merge pull request #178 from ONSdigital/BLAIS5-4434

Promote from BLAIS5-4434 to main
ONSdigital · Oct 8, 2024 · 6471b03 · 6471b03
2 parents b9350d1 + b44ed92
commit 6471b03
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/scripts/blaise/install_cma_packages.ps1 b/scripts/blaise/install_cma_packages.ps1
@@ -99,7 +99,7 @@ function Install-PackageViaBlaiseCli {
 
     $InstrumentName = [System.IO.Path]::GetFileNameWithoutExtension($FilePath)
     LogInfo("Installing package '$InstrumentName' from '$FilePath' into server park '$ServerParkName' via Blaise CLI")
-    & "C:\BlaiseServices\BlaiseCli\blaise.cli.exe" questionnaireinstall -s $ServerParkName -q $InstrumentName -f $FilePath
+    & "C:\BlaiseServices\BlaiseCli\blaise.cli.exe" questionnaireinstall -s $ServerParkName -q $InstrumentName -f $FilePath -o "false"
 }
 
 try {
@@ -112,12 +112,7 @@ try {
     # Install remaining CMA instruments using Blaise CLI for MySQL data interface database configuration
     $InstrumentList = 'CMA_Attempts', 'CMA_ContactInfo', 'CMA_Launcher', 'CMA_Logging'
     foreach ($Instrument in $InstrumentList) {
-        if (Test-InstrumentInstalled -ServerParkName $CmaServerParkName -InstrumentName $Instrument) {
-            LogInfo("Instrument '$Instrument' already installed on server park '$CmaServerParkName', skipping...")
-        }
-        else {
-            Install-PackageViaBlaiseCli -ServerParkName $CmaServerParkName -FilePath "$CmaInstrumentPath\$Instrument.bpkg"
-        }
+        Install-PackageViaBlaiseCli -ServerParkName $CmaServerParkName -FilePath "$CmaInstrumentPath\$Instrument.bpkg"
     }
 
     LogInfo("Removing CMA working folder '$CmaInstrumentPath'")