FEAT: RELOPS-1660 RELOPS-1946

data/os/Windows.yaml

@@ -55,7 +55,9 @@ windows:
     relops_az: "https://roninpuppetassets.blob.core.windows.net/binaries/taskcluster"
     relops_s3: "https://s3-us-west-2.amazonaws.com/ronin-puppet-package-repo/Windows/taskcluster"
     download_url: "https://github.com/taskcluster/taskcluster/releases/download"
-    version: "93.1.1"
+    version: "93.1.4"
+    hw_version: "91.1.0"
+
     generic-worker:
       name:
         amd64: "generic-worker-multiuser-windows-amd64"

data/roles/win116424h2hw.yaml

@@ -18,5 +18,3 @@ win-worker:
   ## Use to overwrite values in the Windows yaml file.
   ## Replace windows. with win-worker.variant.
   variant:
-    taskcluster:
-      version: "91.1.0"

data/roles/win116424h2hwalpha.yaml

@@ -18,5 +18,3 @@ win-worker:
   ## Use to overwrite values in the Windows yaml file.
   ## Replace windows. with win-worker.variant.
   variant:
-    taskcluster:
-      version: "91.1.0"

data/roles/win116424h2hwperfsheriff.yaml

@@ -19,5 +19,3 @@ win-worker:
   ## Use to overwrite values in the Windows yaml file.
   ## Replace windows. with win-worker.variant.
   variant:
-    taskcluster:
-      version: "91.1.0"

data/roles/win116424h2hwref.yaml

@@ -18,5 +18,3 @@ win-worker:
   ## Use to overwrite values in the Windows yaml file.
   ## Replace windows. with win-worker.variant.
   variant:
-    taskcluster:
-      version: "91.1.0"

data/roles/win116424h2hwrefalpha.yaml

@@ -18,5 +18,3 @@ win-worker:
   ## Use to overwrite values in the Windows yaml file.
   ## Replace windows. with win-worker.variant.
   variant:
-    taskcluster:
-      version: "91.1.0"

data/roles/win116424h2hwrelops1213.yaml

@@ -19,5 +19,3 @@ win-worker:
   ## Use to overwrite values in the Windows yaml file.
   ## Replace windows. with win-worker.variant.
   variant:
-    taskcluster:
-      version: "91.1.0"

modules/roles_profiles/manifests/profiles/disable_services.pp

@@ -39,17 +39,36 @@
       include win_disable_services::disable_windows_update
       if $facts['custom_win_purpose'] != builder {
         include win_disable_services::disable_wsearch
-        ## Let's Uninstall Appx Packages
-        ## Taken from https://github.com/The-Virtual-Desktop-Team/Virtual-Desktop-Optimization-Tool
-        ## Bug 1913499 https://bugzilla.mozilla.org/show_bug.cgi?id=1913499 
-        include win_disable_services::uninstall_appx_packages
-        if ($facts['custom_win_location'] == 'azure') {
-          include win_scheduled_tasks::kill_local_clipboard
-        }
+        ## WIP for RELOPS-1946
+        ## Not currently working. Leaving n place for ref.
+        #include win_disable_services::disable_defender_smartscreen
+        #include win_disable_services::disable_sync_from_cloud
         if $facts['custom_win_release_id'] == '2004' or '2009' {
           ## win11 ref with osdcloud
           include win_disable_services::disable_windows_defender_schtask
         }
+        case $facts['custom_win_location'] {
+            'datacenter': {
+                $apx_uninstall = 'hw-uninstall.ps1'
+                include win_disable_services::disable_optional_services
+            }
+            'azure': {
+                include win_scheduled_tasks::kill_local_clipboard
+                $apx_uninstall = 'uninstall.ps1'
+            }
+            default: {
+            }
+        }
+        ## Let's Uninstall Appx Packages
+        ## Taken from https://github.com/The-Virtual-Desktop-Team/Virtual-Desktop-Optimization-Tool
+        ## Bug 1913499 https://bugzilla.mozilla.org/show_bug.cgi?id=1913499
+        class { 'win_disable_services::uninstall_appx_packages':
+            apx_uninstall => $apx_uninstall
+        }
+        ## must be ran after apx uninstall
+        if ($facts['custom_win_location'] == 'datacenter') {
+            include win_disable_services::disable_ms_edge
+        }
       }
       # May be needed for non-hardaware
       # Commented out because this will break the auto restore

modules/roles_profiles/manifests/profiles/scheduled_tasks.pp

@@ -11,8 +11,9 @@
           $startup_script = 'azure-maintainsystem.ps1'
         }
         'datacenter': {
-          #$startup_script = 'maintainsystem-hw.ps1'
-          $startup_script = 'maintainsystem-reftester.ps1'
+          $startup_script = 'maintainsystem-hw.ps1'
+          include win_scheduled_tasks::self_redeploy_check
+          include win_scheduled_tasks::gw_exe_check
         }
         default: {
           $startup_script = 'maintainsystem.ps1'

modules/roles_profiles/manifests/profiles/windows_generic_worker_standalone.pp

@@ -9,7 +9,7 @@
 
             $arch         = 'win64'
 
-            $ext_pkg_src_loc     = lookup('windows.taskcluster.relops_az')
+            $ext_pkg_src_loc     = "${lookup('windows.taskcluster.relops_az')}/"
 
             $generic_worker_dir    = lookup('windows.dir.generic_worker')
             $gw_exe_path           = "${generic_worker_dir}\\generic-worker.exe"
@@ -51,14 +51,14 @@
                 generic_worker_dir       => $generic_worker_dir,
                 gw_config_path           => $gw_config_path,
                 gw_exe_path              => $gw_exe_path,
-                gw_exe_source            => "${ext_pkg_src_loc}/${taskcluster_version}/${gw_name}",
+                gw_exe_source            => "${ext_pkg_src_loc}${taskcluster_version}/${gw_name}",
                 gw_status                => $facts['custom_win_genericworker_service'],
                 livelog_exe              => "${facts['custom_win_systemdrive']}\\\\generic-worker\\\\livelog.exe",
-                livelog_exe_source       => "${ext_pkg_src_loc}/${$taskcluster_version}/${livelog_name}",
+                livelog_exe_source       => "${ext_pkg_src_loc}${taskcluster_version}/${livelog_name}",
                 task_dir                 => "${facts['custom_win_systemdrive']}\\\\",
                 taskcluster_access_token => lookup('taskcluster_access_token'),
                 taskcluster_proxy_exe    => "${facts['custom_win_systemdrive']}\\\\generic-worker\\\\taskcluster-proxy.exe",
-                taskcluster_proxy_source => "${ext_pkg_src_loc}/${taskcluster_version}/${proxy_name}",
+                taskcluster_proxy_source => "${ext_pkg_src_loc}${taskcluster_version}/${proxy_name}",
                 taskcluster_root         => lookup('windows.taskcluster.root_url'),
                 #task_user_init_cmd      => $init,
                 worker_type              => $worker_pool_id,

modules/roles_profiles/manifests/profiles/windows_worker_runner.pp

@@ -11,20 +11,18 @@
 
       case $facts['custom_win_location'] {
         'datacenter': {
-          $ext_pkg_src_loc = lookup('windows.taskcluster.relops_s3')
+          $ext_pkg_src_loc = "${lookup('windows.taskcluster.relops_az')}/"
           $provider = 'standalone'
+          $taskcluster_version    =
+            lookup(['win-worker.variant.taskcluster.version', 'windows.taskcluster.hw_version'])
         }
         default: {
-          #$ext_pkg_src_loc = lookup('windows.taskcluster.relops_az')
           $ext_pkg_src_loc = "${lookup('windows.taskcluster.download_url')}/v"
-          #$ext_pkg_src_loc = "https://github.com/taskcluster/taskcluster/releases/download/v93.1.4/generic-worker-multiuser-windows-arm64"
           $provider = lookup('windows.taskcluster.worker_runner.provider')
+          $taskcluster_version    =
+            lookup(['win-worker.variant.taskcluster.version', 'windows.taskcluster.version'])
         }
       }
-
-      $taskcluster_version    =
-        lookup(['win-worker.variant.taskcluster.version', 'windows.taskcluster.version'])
-
       case $facts['custom_win_os_arch'] {
         'aarch64': {
           $gw_name               = lookup('windows.taskcluster.generic-worker.name.arm64')

modules/roles_profiles/manifests/roles/win116424h2hwrelops1213.pp

@@ -21,14 +21,16 @@
 
   # Adminstration
   include roles_profiles::profiles::logging
+  include roles_profiles::profiles::mercurial
   include roles_profiles::profiles::nuc_management
   #include roles_profiles::profiles::vnc
 
   # Worker
   include roles_profiles::profiles::git
   include roles_profiles::profiles::mozilla_build
   include roles_profiles::profiles::mozilla_maintenance_service
-  include roles_profiles::profiles::windows_generic_worker_standalone
   include roles_profiles::profiles::windows_datacenter_administrator
   include roles_profiles::profiles::google_chrome
+  #include roles_profiles::profiles::windows_generic_worker_standalone
+  include roles_profiles::profiles::windows_worker_runner
 }