Extension sequencing scenario

tests_e2e/orchestrator/lib/agent_test_suite.py

@@ -139,6 +139,8 @@ def __init__(self, metadata: TestSuiteMetadata) -> None:
         self._lisa_environment_name: str  # Name assigned by LISA to the test environment, useful for correlation with LISA logs
         self._environment_name: str  # Name assigned by the AgentTestSuiteCombinator to the test environment
 
+        self._vmss_resource_group_count: int # Counter to keep track of how many resource groups have been created for vmss suites
+
         self._test_suites: List[AgentTestSuite]  # Test suites to execute in the environment
 
         self._cloud: str  # Azure cloud where test VMs are located
@@ -189,6 +191,8 @@ def _initialize(self, environment: Environment, variables: Dict[str, Any], lisa_
         self._lisa_environment_name = environment.name
         self._environment_name = variables["c_env_name"]
 
+        self._vmss_resource_group_count = variables["c_vmss_resource_group_count"]
+
         self._test_suites = variables["c_test_suites"]
 
         self._cloud = variables["cloud"]
@@ -230,9 +234,9 @@ def _initialize(self, environment: Environment, variables: Dict[str, Any], lisa_
 
         if isinstance(environment.nodes[0], LocalNode):
             # We need to create a new VMSS.
-            # Use the same naming convention as LISA for the scale set name: lisa-<runbook name>-<run id>-e0-n0. Note that we hardcode the resource group
-            # id to "e0" and the scale set name to "n0" since we are creating a single scale set.
-            self._resource_group_name = f"lisa-{self._runbook_name}-{RUN_ID}-e0"
+            # Use the same naming convention as LISA for the scale set name: lisa-<runbook name>-<run id>-e0-n0. Note
+            # that we hardcode the scale set name to "n0" since we are creating a single scale set.
+            self._resource_group_name = f"lisa-{self._runbook_name.lower()}-{RUN_ID}-e{self._vmss_resource_group_count}"
             self._vmss_name = f"{self._resource_group_name}-n0"
             self._test_nodes = []  # we'll fill this up when the scale set is created
             self._create_scale_set = True

tests_e2e/orchestrator/lib/agent_test_suite_combinator.py

@@ -81,6 +81,7 @@ def __init__(self, runbook: AgentTestSuitesCombinatorSchema) -> None:
                 raise Exception("Invalid runbook parameters: The 'vmss_name' parameter indicates an existing VMSS, a 'resource_group_name' must be specified.")
 
         self._log: logging.Logger = logging.getLogger("lisa")
+        self._vmss_resource_group_count: int = 0
 
         with set_thread_name("AgentTestSuitesCombinator"):
             if self.runbook.vm_name != '':
@@ -176,10 +177,12 @@ def create_environment_list(self) -> List[Dict[str, Any]]:
                     if test_suite_info.executes_on_scale_set:
                         env = self.create_vmss_environment(
                             env_name=f"{image_name}-vmss-{test_suite_info.name}",
+                            vmss_resource_group_count=self._vmss_resource_group_count,
                             marketplace_image=marketplace_image,
                             location=location,
                             vm_size=vm_size,
                             test_suite_info=test_suite_info)
+                        self._vmss_resource_group_count += 1
                     else:
                         env = self.create_vm_environment(
                             env_name=f"{image_name}-{test_suite_info.name}",
@@ -202,10 +205,12 @@ def create_environment_list(self) -> List[Dict[str, Any]]:
                                 raise Exception("VHDS are currently not supported on scale sets.")
                             env = self.create_vmss_environment(
                                 env_name=env_name,
+                                vmss_resource_group_count=self._vmss_resource_group_count,
                                 marketplace_image=marketplace_image,
                                 location=location,
                                 vm_size=vm_size,
                                 test_suite_info=test_suite_info)
+                            self._vmss_resource_group_count += 1
                         else:
                             env = self.create_vm_environment(
                                 env_name=env_name,
@@ -369,7 +374,7 @@ def create_vm_environment(self, env_name: str, marketplace_image: str, vhd: str,
             "vm_tags": vm_tags
         }
 
-    def create_vmss_environment(self, env_name: str, marketplace_image: str, location: str, vm_size: str, test_suite_info: TestSuiteInfo) -> Dict[str, Any]:
+    def create_vmss_environment(self, env_name: str, vmss_resource_group_count: int, marketplace_image: str, location: str, vm_size: str, test_suite_info: TestSuiteInfo) -> Dict[str, Any]:
         return {
             "c_platform": [
                 {
@@ -388,6 +393,7 @@ def create_vmss_environment(self, env_name: str, marketplace_image: str, locatio
             },
 
             "c_env_name": env_name,
+            "c_vmss_resource_group_count": vmss_resource_group_count,
             "c_test_suites": [test_suite_info],
             "c_location": location,
             "c_image": marketplace_image,

tests_e2e/orchestrator/runbook.yml

@@ -29,7 +29,7 @@ variable:
   # Test suites to execute
   #
   - name: test_suites
-    value: "agent_bvt, no_outbound_connections, extensions_disabled, agent_not_provisioned, fips, agent_ext_workflow, agent_status, multi_config_ext, agent_cgroups, ext_cgroups, agent_firewall, ext_telemetry_pipeline"
+    value: "agent_bvt, no_outbound_connections, extensions_disabled, agent_not_provisioned, fips, agent_ext_workflow, agent_update, agent_status, multi_config_ext, agent_cgroups, ext_cgroups, agent_firewall, ext_telemetry_pipeline, ext_sequencing"
 
   #
   # Parameters used to create test VMs
@@ -136,6 +136,14 @@ variable:
     value: ""
     is_case_visible: true
 
+  #
+  # Count of how many resource groups have been created, used to create a unique resource group name for each vmss test
+  # environment
+  #
+  - name: c_vmss_resource_group_count
+    value: 0
+    is_case_visible: true
+
   #
   # Test suites assigned for execution in the current test environment.
   #

tests_e2e/test_suites/ext_sequencing.yml

@@ -0,0 +1,10 @@
+#
+# Adds extensions with multiple dependencies to VMSS using 'provisionAfterExtensions' property and validates they are
+# enabled in order of dependencies.
+#
+name: "ExtSequencing"
+tests:
+  - "ext_sequencing/ext_sequencing.py"
+images: "endorsed"
+# This scenario is executed on instances of a scaleset created by the agent test suite.
+executes_on_scale_set: true