Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(MAINT) Add locale to vmpooler Jap/French defs #160

Merged
merged 2 commits into from
Aug 2, 2019
Merged

(MAINT) Add locale to vmpooler Jap/French defs #160

merged 2 commits into from
Aug 2, 2019

Conversation

jcoconnor
Copy link
Contributor

This is an outcome of moving the Windows-2012r2 localised vmpooler platforms to Windows 2019. When trying to test the new BHG strings in the ci-job-configs repo using the Puppet Repo Jenkins test harness it was obvious that there were issues with the parsing of the embedded "locale" string in the BHG name.

So since BHG already supports additional Beaker variables in the definition (see the use of the "user" variable for the French platform definitions to allow Windows use a localised Administrator name) it
makes sense to properly embed the "locale" definition here for the French and Japanese platforms.

This will allow the removal of the windows2019_ja-64%7Blocale=ja%7D type string from the Puppet Agent CI job definitions.

This is an outcome of moving the Windows-2012r2 localised vmpooler
platforms to Windows 2019. When trying to test the new BHG strings
in the ci-job-configs repo using the Puppet Repo Jenkins test harness
it was obvious that there were issues with the parsing of the embedded
"locale" string in the BHG name.

So since BHG already supports additional Beaker variables in the
definition (see the use of the "user" variable for the French platform
definitions to allow Windows use a localised Administrator name) it
makes sense to properly embed the "locale" definition here for the
French and Japanese platforms.

This will allow the removal of the  windows2019_ja-64%7Blocale=ja%7D
type string from the Puppet Agent CI job definitions.
@jcoconnor
Copy link
Contributor Author

Hmm - this is not liking the addition of locale, whereas user is ok.
Does the test suite also need updated ?

13:17:02          "CONFIG" => {"consoleport"=>443, "nfs_server"=>"none", "pooling_api"=>"http://vmpooler.delivery.puppetlabs.net/"},
13:17:02         -"HOSTS" => {"windows2016_fr-6432-1"=>{"hypervisor"=>"vmpooler", "packaging_platform"=>"windows-2012-x64", "pe_dir"=>nil, "pe_upgrade_dir"=>nil, "pe_upgrade_ver"=>nil, "pe_ver"=>nil, "platform"=>"windows-2016-64", "roles"=>["agent", "frictionless"], "ruby_arch"=>"x86", "template"=>"win-2016-fr-x86_64", "user"=>"Administrateur"}},
13:17:02         +"HOSTS" => {"windows2016_fr-6432-1"=>{"hypervisor"=>"vmpooler", "locale"=>"fr", "packaging_platform"=>"windows-2012-x64", "pe_dir"=>nil, "pe_upgrade_dir"=>nil, "pe_upgrade_ver"=>nil, "pe_ver"=>nil, "platform"=>"windows-2016-64", "roles"=>["agent", "frictionless"], "ruby_arch"=>"x86", "template"=>"win-2016-fr-x86_64", "user"=>"Administrateur"}},```

To correct the CI/PR test failure.
@jcoconnor
Copy link
Contributor Author

Test fixtures sorted.

Copy link
Contributor

@kevpl kevpl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm 👍

@kevpl kevpl merged commit 7330c82 into voxpupuli:master Aug 2, 2019
@jcoconnor jcoconnor deleted the MAINT-Fix-vmpooler-locales branch August 2, 2019 16:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants