diff --git a/src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json b/src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json index 8976663b404..e193c5e1708 100644 --- a/src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json +++ b/src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json @@ -12,26 +12,11 @@ "test_aks_create_enable_encryption" ], "gpu, no quota": [ - "test_aks_nodepool_add_with_gpu_instance_profile" - ], - "monitoring addon, missing namespace registration": [ - "test_aks_create_with_monitoring_aad_auth_msi", - "test_aks_create_with_monitoring_aad_auth_uai", - "test_aks_enable_monitoring_with_aad_auth_msi", - "test_aks_enable_monitoring_with_aad_auth_uai" - ], - "overlay migration, missing toggle": [ - "test_aks_azure_cni_overlay_migration" - ], - "v2 monitoring addon, missing namespace registration": [ - "test_aks_create_with_azuremonitormetrics", - "test_aks_update_with_azuremonitormetrics" + "test_aks_nodepool_add_with_gpu_instance_profile", + "test_aks_create_gpu_driver_flow" ], "capacity reservation group, no permission": [ "test_aks_create_with_crg_id" - ], - "service mesh, missing feature registration for new resource type": [ - "test_aks_azure_service_mesh_get_revisions" ] } } \ No newline at end of file diff --git a/src/aks-preview/azcli_aks_live_test/configs/ext_matrix_default.json b/src/aks-preview/azcli_aks_live_test/configs/ext_matrix_default.json index 2f6d3f57f27..7aa9277052e 100644 --- a/src/aks-preview/azcli_aks_live_test/configs/ext_matrix_default.json +++ b/src/aks-preview/azcli_aks_live_test/configs/ext_matrix_default.json @@ -24,53 +24,17 @@ "test_aks_nodepool_add_with_gpu_instance_profile", "test_aks_gpu_driver_type" ], - "overlay migration, missing toggle": [ - "test_aks_azure_cni_overlay_migration" - ], "pod ip allocation mode static block, missing feature registration": [ "test_aks_create_with_pod_ip_allocation_mode_static_block" ], - "slb to nat gateway": [ - "test_aks_update_outbound_from_slb_to_natgateway" - ], - "v2 monitoring addon, missing namespace registration": [ - "test_aks_create_with_azuremonitormetrics", - "test_aks_update_with_azuremonitormetrics" - ], - "workload runtime, missing feature registration": [ + "[deprecated] workload runtime, missing feature registration": [ "test_aks_nodepool_add_with_workload_runtime" ], - "artifact streaming, missing feature registration & toggle": [ - "test_aks_nodepool_add_with_artifact_streaming", - "test_aks_nodepool_update_with_artifact_streaming" - ], - "ai toolchain operator, enabled in staging only": [ - "test_aks_create_with_enable_ai_toolchain_operator", - "test_aks_update_with_enable_ai_toolchain_operator" - ], - "trusted launch, missing feature registration & toggle": [ - "test_aks_create_update_secure_boot_flow", - "test_aks_create_update_vtpm_flow" - ], - "nodepool permanent and initialization taints, missing feature registration": [ - "test_aks_create_cluster_with_taints" - ], - "automatic, missing feature registration & toggle": [ + "automatic, no quota": [ "test_aks_automatic_sku" ], - "windows annual, missing feature registration & toggle": [ - "test_aks_nodepool_add_with_ossku_windowsannual" - ], - "mixed sku, enabled in staging only": [ - "test_vms_agentpool_type" - ], - "fqdn policy, enabled in staging only": [ - "test_aks_update_enable_fqdn_policy", - "test_aks_create_with_enable_fqdn_policy", - "test_aks_create_with_enable_fqdn_policy_observability", - "test_aks_create_with_enable_acns", - "test_aks_create_with_enable_acns_complex", - "test_aks_update_enable_acns" + "maxBlockedNodes, missing feature registration & toggle": [ + "test_aks_nodepool_max_blocked_nodes" ] } } diff --git a/src/aks-preview/azcli_aks_live_test/scripts/setup_venv.sh b/src/aks-preview/azcli_aks_live_test/scripts/setup_venv.sh index 9d46f7bec29..8f9e37ba541 100755 --- a/src/aks-preview/azcli_aks_live_test/scripts/setup_venv.sh +++ b/src/aks-preview/azcli_aks_live_test/scripts/setup_venv.sh @@ -47,8 +47,8 @@ setupAZ(){ azdev setup -c "${cli_repo}" -r "${ext_repo}" fi - # fix the issue that vcrpy>=4.3.0 is not compatible with urllib3 - pip install vcrpy==4.2.1 + # need the fix in commit #69621c6 to adapt to the HTTPSHandler in urllib in python3.12 + pip install vcrpy==6.0.2 # fix the issue "Cannot import name 'AccessTokenInfo' from 'azure.core.credentials'" pip install azure-identity==1.17.1 diff --git a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py index 2676dd64c7b..88dd9466b2f 100644 --- a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py +++ b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py @@ -847,6 +847,7 @@ def test_aks_byo_subnet_with_ingress_appgw_addon( "aks create --resource-group={resource_group} --name={aks_name} --enable-managed-identity " "--vnet-subnet-id {vnet_id}/subnets/aks-subnet -a ingress-appgw " "--appgw-name gateway --appgw-subnet-id {vnet_id}/subnets/appgw-subnet " + "--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AppGatewayWithOverlayPreview " "--yes --ssh-key-value={ssh_key_value} -o json" ) aks_cluster = self.cmd( @@ -967,6 +968,7 @@ def test_aks_byo_appgw_with_ingress_appgw_addon( "aks create -n {aks_name} -g {resource_group} --enable-managed-identity " "--vnet-subnet-id {vnet_id}/subnets/aks-subnet " "-a ingress-appgw --appgw-id {appgw_id} --yes " + "--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AppGatewayWithOverlayPreview " "--ssh-key-value={ssh_key_value} -o json" ) aks_cluster = self.cmd(