From 23dc8d36754ced3264a6a73f73d87e77f17af646 Mon Sep 17 00:00:00 2001 From: nshankar Date: Fri, 27 Jun 2025 12:02:38 -0400 Subject: [PATCH 1/3] Use 2nd latest revision for ASM e2e Signed-off-by: nshankar --- .../azext_aks_preview/tests/latest/test_aks_commands.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 effed3d5128..223845ee6f0 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 @@ -167,6 +167,9 @@ def _get_asm_supported_revision(self, location): assert len(mesh_revisions["meshRevisions"]) > 0 revisions = [r["revision"] for r in mesh_revisions["meshRevisions"]] sorted_revisons = self._sort_revisions(revisions) + lenRevisions := len(sorted_revisons) + if lenRevisions > 1: + return sorted_revisons[lenRevisions - 2] # Return the second latest revision return sorted_revisons[0] def _get_asm_upgrade_version(self, resource_group, name): @@ -12615,7 +12618,7 @@ def test_aks_azure_service_mesh_with_egress_gateway( "name": aks_name, "location": resource_group_location, "ssh_key_value": self.generate_ssh_keys(), - "revision": self._get_asm_supported_revision("westus2"), # Temporarily set to prod region to avoid using unsupported ASM revision for centraluseap + "revision": self._get_asm_supported_revision(resource_group_location), } ) From a533b16f96ea383e436b754727d5e3c23eea9d8a Mon Sep 17 00:00:00 2001 From: nshankar Date: Fri, 27 Jun 2025 12:27:51 -0400 Subject: [PATCH 2/3] Fix syntax Signed-off-by: nshankar --- .../azext_aks_preview/tests/latest/test_aks_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 223845ee6f0..1dafc64b14f 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 @@ -167,7 +167,7 @@ def _get_asm_supported_revision(self, location): assert len(mesh_revisions["meshRevisions"]) > 0 revisions = [r["revision"] for r in mesh_revisions["meshRevisions"]] sorted_revisons = self._sort_revisions(revisions) - lenRevisions := len(sorted_revisons) + lenRevisions = len(sorted_revisons) if lenRevisions > 1: return sorted_revisons[lenRevisions - 2] # Return the second latest revision return sorted_revisons[0] From 8962812e1cfa97ab03ed25285e8b39e73c4e5e3d Mon Sep 17 00:00:00 2001 From: nshankar Date: Fri, 27 Jun 2025 13:25:45 -0400 Subject: [PATCH 3/3] Add boolean for secondLatest Signed-off-by: nshankar --- .../tests/latest/test_aks_commands.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 1dafc64b14f..0ec40eadf98 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 @@ -161,14 +161,14 @@ def _convert_revision_to_semver(rev): sorted_revisions = sorted(revisions, key=_convert_revision_to_semver) return sorted_revisions - def _get_asm_supported_revision(self, location): + def _get_asm_supported_revision(self, location, secondLatest=False): mesh_revisions_cmd = f"aks mesh get-revisions -l {location}" mesh_revisions = self.cmd(mesh_revisions_cmd).get_output_in_json() assert len(mesh_revisions["meshRevisions"]) > 0 revisions = [r["revision"] for r in mesh_revisions["meshRevisions"]] sorted_revisons = self._sort_revisions(revisions) lenRevisions = len(sorted_revisons) - if lenRevisions > 1: + if secondLatest and lenRevisions > 1: return sorted_revisons[lenRevisions - 2] # Return the second latest revision return sorted_revisons[0] @@ -12544,7 +12544,7 @@ def test_aks_azure_service_mesh_enable_disable( "name": aks_name, "location": resource_group_location, "ssh_key_value": self.generate_ssh_keys(), - "revision": self._get_asm_supported_revision(resource_group_location), + "revision": self._get_asm_supported_revision(resource_group_location, False), } ) @@ -12618,7 +12618,7 @@ def test_aks_azure_service_mesh_with_egress_gateway( "name": aks_name, "location": resource_group_location, "ssh_key_value": self.generate_ssh_keys(), - "revision": self._get_asm_supported_revision(resource_group_location), + "revision": self._get_asm_supported_revision(resource_group_location, True), } ) @@ -12826,7 +12826,7 @@ def test_aks_azure_service_mesh_with_ingress_gateway( "name": aks_name, "location": resource_group_location, "ssh_key_value": self.generate_ssh_keys(), - "revision": self._get_asm_supported_revision(resource_group_location), + "revision": self._get_asm_supported_revision(resource_group_location, False), } ) @@ -12912,7 +12912,7 @@ def test_aks_azure_service_mesh_canary_upgrade( self.test_resources_count = 0 # kwargs for string formatting aks_name = self.create_random_name("cliakstest", 16) - installed_revision = self._get_asm_supported_revision(resource_group_location) + installed_revision = self._get_asm_supported_revision(resource_group_location, False) self.kwargs.update( { "resource_group": resource_group, @@ -13039,7 +13039,7 @@ def test_aks_azure_service_mesh_with_pluginca( "location": resource_group_location, "ssh_key_value": self.generate_ssh_keys(), "akv_resource_id": akv_resource_id, - "revision": self._get_asm_supported_revision(resource_group_location), + "revision": self._get_asm_supported_revision(resource_group_location, False), } ) @@ -13147,7 +13147,7 @@ def test_aks_azure_service_mesh_get_upgrades( "name": aks_name, "location": resource_group_location, "ssh_key_value": self.generate_ssh_keys(), - "revision": self._get_asm_supported_revision(resource_group_location), + "revision": self._get_asm_supported_revision(resource_group_location, False), } )