Adds Puppet Support for secrets and keys for Win 7 and Win 10 testers

RESOLVED FIXED

Status

RESOLVED FIXED
3 years ago
3 years ago

People

(Reporter: markco, Assigned: markco)

Tracking

Details

Attachments

(3 attachments, 1 obsolete attachment)

Comment hidden (empty)
(Assignee)

Updated

3 years ago
Assignee: relops → mcornmesser
(Assignee)

Updated

3 years ago
Blocks: 1231494
(Assignee)

Updated

3 years ago
Depends on: 1231497
(Assignee)

Comment 1

3 years ago
Created attachment 8702940 [details] [diff] [review]
BUG1231493-Win7Slave.patch
(Assignee)

Updated

3 years ago
Attachment #8702940 - Flags: review?(dustin)
Comment on attachment 8702940 [details] [diff] [review]
BUG1231493-Win7Slave.patch

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

::: modules/disableservices/manifests/winreport.pp
@@ -6,4 @@
>  
>  class disableservices::winreport {
>      if ($env_os_version != 2008) {
> -        service { "Windows Error Reporting Service":

Does this change break something else where it is called "Windows Error Reporting Service"?
Attachment #8702940 - Flags: review?(dustin) → review+
(Assignee)

Comment 4

3 years ago
It doesn't break anything. It was not actually being applied for 2008, and I was leaving the manifest as a place holder for when it was needed on the testers.
(Assignee)

Comment 5

3 years ago
Created attachment 8704220 [details] [diff] [review]
BUG1231493-Win7Token.patch
Attachment #8704220 - Flags: review?(dustin)
Comment on attachment 8704220 [details] [diff] [review]
BUG1231493-Win7Token.patch

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

::: modules/toplevel/manifests/slave.pp
@@ +18,4 @@
>      if ($::operatingsystem == "Darwin") or ($::operatingsystem == "Windows") {
>          include users::builder::autologin
>      }
> +    # The initial pass for support for Win 7 is meant to only support secrets 

Trailing space (travis will complain)
Attachment #8704220 - Flags: review?(dustin) → review+
(Assignee)

Comment 8

3 years ago
Created attachment 8708533 [details] [diff] [review]
BUG1231493-Win10Slave.patch
Attachment #8708533 - Flags: review?(dustin)
Comment on attachment 8708533 [details] [diff] [review]
BUG1231493-Win10Slave.patch

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

::: modules/packages/manifests/pkgzip.pp
@@ +8,5 @@
>      $installersource_posix = 'c:/InstallerSource/puppetagain.pub.build.mozilla.org'
>      $installersource_win = 'c:\InstallerSource\puppetagain.pub.build.mozilla.org'
> +    $quoted_7zip =  $hardwaremodel ? {
> +        x64 => '"C:\Program Files (x86)\7-Zip\7z.exe"',
> +        default => '"C:\Program Files\7-Zip\7z.exe"',

What happened here?  x64 -> (x86)??
(In reply to Dustin J. Mitchell [:dustin] from comment #9)
> Comment on attachment 8708533 [details] [diff] [review]
> BUG1231493-Win10Slave.patch
> 
> Review of attachment 8708533 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: modules/packages/manifests/pkgzip.pp
> @@ +8,5 @@
> >      $installersource_posix = 'c:/InstallerSource/puppetagain.pub.build.mozilla.org'
> >      $installersource_win = 'c:\InstallerSource\puppetagain.pub.build.mozilla.org'
> > +    $quoted_7zip =  $hardwaremodel ? {
> > +        x64 => '"C:\Program Files (x86)\7-Zip\7z.exe"',
> > +        default => '"C:\Program Files\7-Zip\7z.exe"',
> 
> What happened here?  x64 -> (x86)??

Without speaking to complete patch validity, that is a *common* idiom on windows, "Program Files (x86)" tends to house x86 binaries on a 64 bit windows, rather than "Program Files\" and sometimes its done transparently to the programs installer depending on what API's they use. It's odd to see but usually valid.
(Assignee)

Updated

3 years ago
Attachment #8708533 - Flags: review?(dustin)
Comment on attachment 8708533 [details] [diff] [review]
BUG1231493-Win10Slave.patch

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

::: modules/packages/manifests/pkgzip.pp
@@ +8,5 @@
>      $installersource_posix = 'c:/InstallerSource/puppetagain.pub.build.mozilla.org'
>      $installersource_win = 'c:\InstallerSource\puppetagain.pub.build.mozilla.org'
> +    $quoted_7zip =  $hardwaremodel ? {
> +        x64 => '"C:\Program Files (x86)\7-Zip\7z.exe"',
> +        default => '"C:\Program Files\7-Zip\7z.exe"',

Ah, I see, so it used to treat "x64" as the default, and now treats "x86" as the default, but also switched the values.  So I don't think this has any effect, but is correct..
Attachment #8708533 - Flags: review+
(Assignee)

Comment 12

3 years ago
Created attachment 8708562 [details] [diff] [review]
BUG1231493-Win10Slave.patch

A small change form the last patch. For the 7zip directory. I made the directory for the x64 OSes the default in the conditionals and the Win 7, which comes up as i686 for the new variable as the exception. The variable that was being use had to change because it was not available within the Win 10 environment.
Attachment #8708533 - Attachment is obsolete: true
Attachment #8708562 - Flags: review?(dustin)
Attachment #8708562 - Flags: review?(dustin) → review+
(Assignee)

Updated

3 years ago
Status: NEW → RESOLVED
Last Resolved: 3 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.