From 7bfeecf1af55db39ea37a0a8d77029684f554f00 Mon Sep 17 00:00:00 2001
From: narrieta <narrieta>
Date: Wed, 7 Feb 2024 14:54:24 -0800
Subject: [PATCH] Skip capture of VM information on test runs

---
 tests_e2e/orchestrator/docker/Dockerfile               |  2 +-
 tests_e2e/orchestrator/lib/agent_junit.py              |  1 +
 .../orchestrator/lib/agent_test_suite_combinator.py    | 10 +++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tests_e2e/orchestrator/docker/Dockerfile b/tests_e2e/orchestrator/docker/Dockerfile
index 33ef0b44bd..597e57418b 100644
--- a/tests_e2e/orchestrator/docker/Dockerfile
+++ b/tests_e2e/orchestrator/docker/Dockerfile
@@ -67,7 +67,7 @@ RUN \
     cd $HOME                                                                                                  && \
     git clone https://github.com/microsoft/lisa.git                                                           && \
     cd lisa                                                                                                   && \
-    git checkout 7396cbd6d9b31a99b13c184f735ce9827334f21b                                                     && \
+    git checkout 2c16e32001fdefb9572dff61241451b648259dbf                                                     && \
                                                                                                                  \
     python3 -m pip install --upgrade pip                                                                      && \
     python3 -m pip install --editable .[azure,libvirt] --config-settings editable_mode=compat                 && \
diff --git a/tests_e2e/orchestrator/lib/agent_junit.py b/tests_e2e/orchestrator/lib/agent_junit.py
index 47a5e7d697..2e09c73d75 100644
--- a/tests_e2e/orchestrator/lib/agent_junit.py
+++ b/tests_e2e/orchestrator/lib/agent_junit.py
@@ -37,6 +37,7 @@
 @dataclass
 class AgentJUnitSchema(schema.Notifier):
     path: str = "agent.junit.xml"
+    include_subtest: bool = True
 
 
 class AgentJUnit(JUnit):
diff --git a/tests_e2e/orchestrator/lib/agent_test_suite_combinator.py b/tests_e2e/orchestrator/lib/agent_test_suite_combinator.py
index 4b650e8641..ffecaf3630 100644
--- a/tests_e2e/orchestrator/lib/agent_test_suite_combinator.py
+++ b/tests_e2e/orchestrator/lib/agent_test_suite_combinator.py
@@ -276,7 +276,8 @@ def create_existing_vm_environment(self) -> Dict[str, Any]:
             "c_env_name": self.runbook.vm_name,
             "c_platform": [
                 {
-                    "type": "ready"
+                    "type": "ready",
+                    "capture_vm_information": False
                 }
             ],
             "c_environment": {
@@ -331,7 +332,8 @@ def create_existing_vmss_environment(self) -> Dict[str, Any]:
             },
             "c_platform": [
                 {
-                    "type": "ready"
+                    "type": "ready",
+                    "capture_vm_information": False
                 }
             ],
             "c_location": self.runbook.location,
@@ -356,6 +358,7 @@ def create_vm_environment(self, env_name: str, marketplace_image: str, vhd: str,
                     "admin_username": self.runbook.user,
                     "admin_private_key_file": self.runbook.identity_file,
                     "keep_environment": self.runbook.keep_environment,
+                    "capture_vm_information": False,
                     "azure": {
                         "deploy": True,
                         "cloud": self.runbook.cloud,
@@ -406,7 +409,8 @@ def create_vmss_environment(self, env_name: str, marketplace_image: str, locatio
         return {
             "c_platform": [
                 {
-                    "type": "ready"
+                    "type": "ready",
+                    "capture_vm_information": False
                 }
             ],