Bug 1358561 additional datacenter support (#67)

nodeploy
mozilla-releng · May 8, 2017 · e32af96 · e32af96
1 parent ab8371e
commit e32af96
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/userdata/Configuration/GenericWorker/run-hw-generic-worker-and-reboot.bat b/userdata/Configuration/GenericWorker/run-hw-generic-worker-and-reboot.bat
@@ -0,0 +1,15 @@
+@echo off
+
+if exist C:\generic-worker\disable-desktop-interrupt.reg reg import C:\generic-worker\disable-desktop-interrupt.reg
+
+:CheckForStateFlag
+if exist C:\dsc\task-claim-state.valid goto RunWorker
+timeout /t 1 >nul
+goto CheckForStateFlag
+
+:RunWorker
+del /Q /F C:\dsc\task-claim-state.valid
+pushd %~dp0
+C:\generic-worker\generic-worker.exe run --config C:\generic-worker\gen_worker.config > C:\generic-worker\generic-worker.log 2>&1
+
+shutdown /r /t 0 /f /c "Rebooting as generic worker ran successfully"
diff --git a/userdata/Manifest/gecko-t-win10-64-hw.json b/userdata/Manifest/gecko-t-win10-64-hw.json
@@ -749,7 +749,7 @@
           "ComponentName": "DisableDesktopInterrupt"
         }
       ],
-      "Source": "https://raw.githubusercontent.com/mozilla-releng/OpenCloudConfig/master/userdata/Configuration/GenericWorker/run-generic-worker.bat",
+      "Source": "https://raw.githubusercontent.com/mozilla-releng/OpenCloudConfig/master/userdata/Configuration/GenericWorker/run-hw-generic-worker-and-reboot.bat",
       "Target": "C:\\generic-worker\\run-generic-worker.bat"
     },
     {

diff --git a/userdata/Manifest/gecko-t-win7-32-hw.json b/userdata/Manifest/gecko-t-win7-32-hw.json
@@ -416,13 +416,6 @@
         }
       ]
     },
-    {
-      "ComponentName": "SystemPowerShellProfile",
-      "ComponentType": "FileDownload",
-      "Comment": "Maintenance Toolchain - not essential for building firefox",	
-      "Source": "https://raw.githubusercontent.com/mozilla-releng/OpenCloudConfig/master/userdata/Configuration/Microsoft.PowerShell_profile.ps1",
-      "Target": "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\Microsoft.PowerShell_profile.ps1"
-    },
     {
       "ComponentName": "FsutilDisable8Dot3",
       "ComponentType": "CommandRun",
@@ -830,7 +823,7 @@
           "ComponentName": "DisableDesktopInterrupt"
         }
       ],
-      "Source": "https://raw.githubusercontent.com/mozilla-releng/OpenCloudConfig/master/userdata/Configuration/GenericWorker/run-generic-worker-format-and-reboot.bat",
+      "Source": "https://raw.githubusercontent.com/mozilla-releng/OpenCloudConfig/master/userdata/Configuration/GenericWorker/run-hw-generic-worker-and-reboot.bat",
       "Target": "C:\\generic-worker\\run-generic-worker.bat"
     },
     {

diff --git a/userdata/rundsc.ps1 b/userdata/rundsc.ps1
@@ -559,6 +559,10 @@ If ($locationType -eq "AWS") {
     & schtasks @('/create', '/tn', 'HaltOnIdle', '/sc', 'minute', '/mo', '2', '/ru', 'SYSTEM', '/rl', 'HIGHEST', '/tr', 'powershell.exe -File C:\dsc\HaltOnIdle.ps1', '/f')
     Write-Log -message 'scheduled task: HaltOnIdle, created.' -severity 'INFO'
 }
+If ($locationType -eq "datacenter") {
+  $isWorker = $true
+  $runDscOnWorker = $true
+}
 
   if (($runDscOnWorker) -or (-not ($isWorker))) {