Fix Jenkins installer: find Inno Setup ISCC under user profiles.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: baasith6

Jenkinsfile

@@ -13,6 +13,7 @@ pipeline {
   environment {
     VM_APP_DIR = '/opt/onevo/app'
     ONEVO_PYTHON = 'C:\\Users\\Abdul Baasith\\AppData\\Local\\Python\\bin\\python.exe'
+    ONEVO_ISCC = 'C:\\Users\\Abdul Baasith\\AppData\\Local\\Programs\\Inno Setup 6\\ISCC.exe'
   }
 
   stages {
@@ -57,14 +58,15 @@ pipeline {
             keyFileVariable: 'SSH_KEY',
             usernameVariable: 'SSH_USER'
           )]) {
-            bat """
+            bat '''
               powershell -ExecutionPolicy Bypass -File scripts/deploy-vm.ps1 ^
-                -VmHost ${params.VM_HOST} ^
-                -VmUser ${params.VM_USER} ^
-                -BackendUrl ${params.BACKEND_URL} ^
+                -VmHost ''' + params.VM_HOST + ''' ^
+                -VmUser ''' + params.VM_USER + ''' ^
+                -BackendUrl ''' + params.BACKEND_URL + ''' ^
                 -PythonPath "%ONEVO_PYTHON%" ^
-                -SshKeyPath "${env.SSH_KEY}"${extra}
-            """
+                -IsccPath "%ONEVO_ISCC%" ^
+                -SshKeyPath "%SSH_KEY%"''' + extra + '''
+            '''
           }
         }
       }

connector/installer/build.ps1

@@ -3,6 +3,7 @@ param(
     [Parameter(Mandatory = $true)]
     [string]$BackendUrl,
     [string]$PythonPath = "",
+    [string]$IsccPath = "",
     [switch]$AllowHttp
 )
 
@@ -24,17 +25,28 @@ function Assert-BackendUrl([string]$Url, [bool]$AllowHttp) {
     throw "Production requires HTTPS (or http://localhost / http://127.0.0.1 for local builds). Got: $Url. Use -AllowHttp for MVP pilot without TLS."
 }
 
-function Find-ISCC {
+function Find-ISCC([string]$ExplicitPath) {
     $candidates = @(
+        $ExplicitPath,
+        $env:ONEVO_ISCC,
         "${env:ProgramFiles(x86)}\Inno Setup 6\ISCC.exe",
         "${env:ProgramFiles}\Inno Setup 6\ISCC.exe",
         "$env:LOCALAPPDATA\Programs\Inno Setup 6\ISCC.exe",
         (Get-Command ISCC -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Source)
-    ) | Where-Object { $_ -and (Test-Path $_) }
-    if (-not $candidates) {
-        throw "Inno Setup 6 (ISCC.exe) was not found. Install from https://jrsoftware.org/isdl.php"
+    )
+    $userRoots = Get-ChildItem 'C:\Users' -Directory -ErrorAction SilentlyContinue |
+        Where-Object { $_.Name -notin @('Public', 'Default', 'Default User', 'All Users') }
+    foreach ($user in $userRoots) {
+        $candidates += @(
+            (Join-Path $user.FullName 'AppData\Local\Programs\Inno Setup 6\ISCC.exe'),
+            (Join-Path $user.FullName 'AppData\Local\Programs\Inno Setup 6\Compil32.exe')
+        )
     }
-    return ($candidates | Select-Object -First 1)
+    $found = $candidates | Where-Object { $_ -and (Test-Path $_) } | Select-Object -First 1
+    if (-not $found) {
+        throw "Inno Setup 6 (ISCC.exe) was not found. Install from https://jrsoftware.org/isdl.php or set ONEVO_ISCC."
+    }
+    return $found
 }
 
 function Find-Python([string]$ExplicitPath) {
@@ -115,7 +127,7 @@ if (-not (Test-Path $pyinstallerOut)) {
 }
 Write-Host "==> Built $pyinstallerOut"
 
-$iscc = Find-ISCC
+$iscc = Find-ISCC $IsccPath
 Write-Host "==> Inno Setup: $iscc"
 & $iscc $IssFile
 if ($LASTEXITCODE -ne 0) { throw "Inno Setup failed (exit $LASTEXITCODE)" }

docs/JENKINS_DEPLOY.md

@@ -91,7 +91,7 @@ powershell -ExecutionPolicy Bypass -File scripts/deploy-vm.ps1 -SkipInstaller
 | SSH permission denied | Re-check `onevo-vm-ssh-key` credential; deploy script copies the key with strict ACLs for OpenSSH on Windows |
 | GPU compose error | Keep `USE_GPU=false` on CPU VM |
 | Missing `ffmpeg.exe` | First build auto-downloads to `%ProgramData%\onevo\installer-tools\`; or run `scripts/ensure-installer-tools.ps1` once |
-| Installer build fails | Install Inno Setup 6 + PyInstaller; run `scripts/build-installer.ps1` manually once |
+| Installer build fails | Install **Inno Setup 6** (user or Program Files); set `ONEVO_ISCC` in Jenkinsfile if needed |
 | Backend unhealthy after deploy | SSH to VM: `cd /opt/onevo/app && docker compose logs backend --tail 50` |
 
 ## Related

scripts/build-installer.ps1

@@ -3,6 +3,7 @@ param(
   [Parameter(Mandatory = $true)]
   [string]$BackendUrl,
   [string]$PythonPath = "",
+  [string]$IsccPath = "",
   [switch]$AllowHttp
 )
 
@@ -17,6 +18,7 @@ if (-not (Test-Path $buildScript)) {
 Write-Host "Building ONEVO connector installer for $BackendUrl ..."
 $buildArgs = @{ BackendUrl = $BackendUrl }
 if ($PythonPath) { $buildArgs.PythonPath = $PythonPath }
+if ($IsccPath) { $buildArgs.IsccPath = $IsccPath }
 if ($AllowHttp) { $buildArgs.AllowHttp = $true }
 & $buildScript @buildArgs
 

scripts/deploy-vm.ps1

@@ -6,6 +6,7 @@ param(
   [string]$BackendUrl = "http://20.193.69.220:8081",
   [string]$SshKeyPath = "",
   [string]$PythonPath = "",
+  [string]$IsccPath = "",
   [switch]$SkipInstaller,
   [switch]$SkipBuild,
   [switch]$UseGpu
@@ -84,6 +85,7 @@ if (-not $SkipInstaller) {
   Write-Host "==> Building Windows installer..."
   $installerArgs = @{ BackendUrl = $BackendUrl; AllowHttp = $true }
   if ($PythonPath) { $installerArgs.PythonPath = $PythonPath }
+  if ($IsccPath) { $installerArgs.IsccPath = $IsccPath }
   & (Join-Path $root "scripts\build-installer.ps1") @installerArgs
   $installerExe = Get-ChildItem (Join-Path $root "connector\dist\ONEVO-Connector-Setup-*.exe") |
     Sort-Object LastWriteTime -Descending | Select-Object -First 1