1249087 - WIn 7 add support to toplevel::slave::releng::test

Status: RESOLVED FIXED

(Infrastructure & Operations :: RelOps: Puppet, task)

Comment 1

[Mark Cornmesser [:markco] OOO 2024/04/15]

Need to include:

disableservices::disableupdates 
disableservices::disable_indexing
tweaks::memory_paging
disableservices::disable_win_defend

Comment 2

[Mark Cornmesser [:markco] OOO 2024/04/15]

packages::mozilla::mozilla_maintenance_service

Comment 3

[Mark Cornmesser [:markco] OOO 2024/04/15]

Attachment: BUG1249087.patch

Note this is not full talos support.

Comment 4

[Dustin J. Mitchell [:dustin] (he/him)]

Comment on attachment 8727992 [details] [diff] [review]
BUG1249087.patch

Review of attachment 8727992 [details] [diff] [review]:
-----------------------------------------------------------------

Looks good otherwise -- sorry I have to be brief since I'm running off.  Happy to talk more.

::: modules/httpd/files/httpd.conf
@@ +1,1 @@
> +#

For Linux and OS X, we use the default httpd config, and then add any required adjustments using httpd::config.  We should do the same for Windows.

Comment 5

[Mark Cornmesser [:markco] OOO 2024/04/15]

Below is a diff of original httpd.conf and the one we have been copying over forever now. Some of the changes will need to be carried over. How could I do that in httpd::config ?



Compare: (<)C:\Users\mcornmesser\Desktop\scratch\httpd_orig.txt (18215 bytes)
   with: (>)C:\Users\mcornmesser\Desktop\scratch\httpd_new.txt (18233 bytes)

17,18c17,18
< # with ServerRoot set to "c:/Program Files/Apache Software Foundation/Apache2.2" will be interpreted by the
< # server as "c:/Program Files/Apache Software Foundation/Apache2.2/logs/foo.log".
---
> # with ServerRoot set to "C:/Program Files (x86)/Apache Software Foundation/Apache2.2" will be interpreted by the
> # server as "C:/Program Files (x86)/Apache Software Foundation/Apache2.2/logs/foo.log".
35c35
< ServerRoot "c:/Program Files/Apache Software Foundation/Apache2.2"
---
> ServerRoot "C:/Program Files (x86)/Apache Software Foundation/Apache2.2"
163c163
< ServerAdmin 
---
> ServerAdmin [e-mail]
172c172
< #ServerName :80
---
> #ServerName localhost:80
179c179
< DocumentRoot "c:/Program Files/Apache Software Foundation/Apache2.2/htdocs"
---
> DocumentRoot "C:\slave\talos-data\talos"
206c206
< <Directory "c:/Program Files/Apache Software Foundation/Apache2.2/htdocs">
---
> <Directory "C:/slave/talos-data/talos">
290c290
<     CustomLog "logs/access.log" common
---
>     # CustomLog "logs/access.log" common
305c305
<     # Redirect permanent /foo http:///bar
---
>     # Redirect permanent /foo http://localhost/bar
326c326
<     ScriptAlias /cgi-bin/ "c:/Program Files/Apache Software Foundation/Apache2.2/cgi-bin/"
---
>     ScriptAlias /cgi-bin/ "C:/Program Files (x86)/Apache Software Foundation/Apache2.2/cgi-bin/"
339,342c339,342
< # "c:/Program Files/Apache Software Foundation/Apache2.2/cgi-bin" should be changed to whatever your ScriptAliased
< # CGI directory exists, if you have that configured.
< #
< <Directory "c:/Program Files/Apache Software Foundation/Apache2.2/cgi-bin">
---
> # "C:/Program Files (x86)/Apache Software Foundation/Apache2.2/cgi-bin" should be changed to whatever your ScriptAliased
> # CGI directory exists, if you have that configured.
> #
> <Directory "C:/Program Files (x86)/Apache Software Foundation/Apache2.2/cgi-bin">
423c423
< #ErrorDocument 402 http:///subscription_info.html
---
> #ErrorDocument 402 http://localhost/subscription_info.html

Comment 6

[Dustin J. Mitchell [:dustin] (he/him)]

Wow, I think you can use
  https://github.com/mozilla/build-puppet/blob/master/modules/talos/templates/talos-httpd.conf.erb
unchanged. Just set $apachedocumentroot in
  https://github.com/mozilla/build-puppet/blob/master/modules/talos/manifests/settings.pp
to
  'C:/slave/talos-data/talos'
on Windows.  You can leave $requireall alone.

That reverses the slashes on the DocumentRoot directive, but given that the default value for that field has forward slashes, I'm betting that won't matter.

Comment 7

[Mark Cornmesser [:markco] OOO 2024/04/15]

Note: need to include classes added in Bug 1255199: 

disableservices/manifests/disable_win_driver_signing.pp
tweaks/manifests/disable_desktop_interruption.pp
tweaks/manifests/sync_logon_scripts.pp

Comment 8

[Mark Cornmesser [:markco] OOO 2024/04/15]

Additional errors that need to be addressed by this patch: 

Fri Apr 29 10:22:13 -0700 2016 Puppet (err): Unexpected exception from Win32 API. detail: (Access is denied.). ERROR CODE: 5. Puppet Error ID: F46C6AE2-C711-48F9-86D6-5D50E1988E48

Fri Apr 29 10:22:13 -0700 2016 /Stage[main]/Disableservices::Disable_win_defend/Registry::Value[DisableRemovableDriveScanning]/Registry_value[HKLM\SOFTWARE\Microsoft\Windows Defender\Scan\DisableRemovableDriveScanning]/ensure (err): change from absent to present failed: Unexpected exception from Win32 API. detail: (Access is denied.). ERROR CODE: 5. Puppet Error ID: F46C6AE2-C711-48F9-86D6-5D50E1988E48

Fri Apr 29 10:22:55 -0700 2016 /Stage[main]/Packages::Mozilla::Mozilla_build/Exec[uninstall_hg] (err): Could not evaluate: Could not find command 'C:\mozilla-build\msys\bin\ls.exe'

Fri Apr 29 10:24:42 -0700 2016 /Stage[main]/Packages::Wget/Packages::Pkgzip[wget-1.16.3-win32.zip]/Shared::Execonce[wget-1.16.3-win32.zip]/Exec[wget-1.16.3-win32.zip] (err): Failed to call refresh: "C:\Program Files\7-Zip\7z.exe" x c:\InstallerSource\puppetagain.pub.build.mozilla.org\ZIPs\wget-1.16.3-win32.zip -oC:\mozilla-build/wget -y returned 2 instead of one of [0]

Fri Apr 29 10:24:42 -0700 2016 /Stage[main]/Packages::Wget/Packages::Pkgzip[wget-1.16.3-win32.zip]/Shared::Execonce[wget-1.16.3-win32.zip]/Exec[wget-1.16.3-win32.zip] (err): "C:\Program Files\7-Zip\7z.exe" x c:\InstallerSource\puppetagain.pub.build.mozilla.org\ZIPs\wget-1.16.3-win32.zip -oC:\mozilla-build/wget -y returned 2 instead of one of [0]

Comment 9

[Mark Cornmesser [:markco] OOO 2024/04/15]

Attachment: Bug1249087_Win7_support_toplevel slave releng test.patch

Comment 10

[Mark Cornmesser [:markco] OOO 2024/04/15]

Comment on attachment 8748928 [details] [diff] [review]
Bug1249087_Win7_support_toplevel slave releng test.patch

Note: I have removed the white spaces that show up in the patch. 

Tagged Dustin for feedback since he reviewed the original patch.

Comment 11

[Jake Watkins [:dividehex]]

Comment on attachment 8748928 [details] [diff] [review]
Bug1249087_Win7_support_toplevel slave releng test.patch

Review of attachment 8748928 [details] [diff] [review]:
-----------------------------------------------------------------

Fix the trailing whitespaces.  Otherwise it looks fine.

Comment 12

[Mark Cornmesser [:markco] OOO 2024/04/15]

Comment on attachment 8748928 [details] [diff] [review]
Bug1249087_Win7_support_toplevel slave releng test.patch

https://hg.mozilla.org/build/puppet/rev/e2d039909524