Skip to content

{AKS} Update default test matrix #4161

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.

Sign up for GitHub

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

Merged
zhoxing-ms merged 4 commits into from
Nov 29, 2021
Merged

{AKS} Update default test matrix #4161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9fb6e94
update gmsa test cases
FumingZhang Nov 25, 2021
c80e40b
update default test matrix
FumingZhang Nov 25, 2021
81edee4
exclude ossku cases
FumingZhang Nov 29, 2021
112d8c2
fix test
FumingZhang Nov 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
]
},
"exclude": {
"compatibility issue": [
"test_aks_nodepool_add_with_ossku"
],
"need additional feature": [
"test_aks_create_enable_encryption",
"test_aks_create_edge_zone"
Expand Down
15 changes: 0 additions & 15 deletions src/aks-preview/azcli_aks_live_test/configs/ext_matrix_default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,9 @@
"test_aks_create_with_ossku"
],
"need additional feature": [
"test_aks_create_with_azurekeyvaultsecretsprovider_addon",
"test_aks_create_addon_with_azurekeyvaultsecretsprovider_with_secret_rotation",
"test_aks_enable_addon_with_azurekeyvaultsecretsprovider",
"test_aks_create_with_gitops_addon",
"test_aks_enable_addon_with_gitops",
"test_aks_disable_addon_gitops",
"test_aks_enable_addon_with_openservicemesh",
"test_aks_disable_addon_openservicemesh",
"test_aks_addon_disable_openservicemesh",
"test_aks_addon_show_openservicemesh_enabled",
"test_aks_addon_enable_with_openservicemesh",
"test_aks_addon_list_openservicemesh_enabled",
"test_aks_addon_update_with_azurekeyvaultsecretsprovider",
"test_aks_addon_enable_with_azurekeyvaultsecretsprovider",
"test_aks_create_with_auto_upgrade_channel",
"test_aks_disable_local_accounts",
"test_aks_create_with_pod_identity_enabled",
"test_aks_create_using_azurecni_with_pod_identity_enabled",
"test_aks_pod_identity_usage",
Expand All @@ -38,8 +25,6 @@
"test_aks_create_with_http_proxy_config",
"test_aks_nodepool_add_with_workload_runtime",
"test_aks_nodepool_add_with_gpu_instance_profile",
"test_aks_create_with_windows_gmsa",
"test_aks_update_with_windows_gmsa",
"test_aks_snapshot"
]
}
Expand Down
7 changes: 5 additions & 2 deletions src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2868,7 +2868,8 @@ def test_aks_create_with_windows_gmsa(self, resource_group, resource_group_locat
'--dns-name-prefix={dns_name_prefix} --node-count=1 ' \
'--windows-admin-username={windows_admin_username} --windows-admin-password={windows_admin_password} ' \
'--load-balancer-sku=standard --vm-set-type=virtualmachinescalesets --network-plugin=azure ' \
'--ssh-key-value={ssh_key_value} --enable-windows-gmsa --yes'
'--ssh-key-value={ssh_key_value} --enable-windows-gmsa --yes ' \
'--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AKSWindowsGmsaPreview'
self.cmd(create_cmd, checks=[
self.exists('fqdn'),
self.exists('nodeResourceGroup'),
Expand Down Expand Up @@ -2929,7 +2930,9 @@ def test_aks_update_with_windows_gmsa(self, resource_group, resource_group_locat
])

# update Windows gmsa
self.cmd('aks update --resource-group={resource_group} --name={name} --enable-windows-gmsa --yes', checks=[
update_cmd = "aks update --resource-group={resource_group} --name={name} --enable-windows-gmsa --yes " \
"--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AKSWindowsGmsaPreview"
self.cmd(update_cmd, checks=[
self.check('provisioningState', 'Succeeded'),
self.check('windowsProfile.gmsaProfile.enabled', 'True')
])
Expand Down
2 changes: 1 addition & 1 deletion src/aks-preview/azext_aks_preview/tests/latest/test_decorator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1969,7 +1969,7 @@ def test_construct_preview_mc_profile(self):
get_subscription_id=Mock(return_value="1234-5678-9012")
)
with patch(
"azure.cli.command_modules.acs.decorator._get_rg_location",
"azure.cli.command_modules.acs.decorator.get_rg_location",
return_value="test_location",
), patch(
"azure.cli.command_modules.acs.decorator.Profile",
Expand Down