commit f79e529e29fc58ac3810ce727513584c3ccbd572
author Congbin Guo <guocb@chromium.org> Sat Mar 13 00:46:59 2021 +0000
committer Congbin Guo <guocb@chromium.org> Sat Mar 13 00:47:40 2021 +0000
tree 7548fe9eb75167a97c6ae69c09b084e8d722cbd4
parent 78a168d9b4d7b348f38ebbad53d4cbb10497ed60

Revert "Adding logging to lxc-start"

This reverts commit 7770ac97447542bcb80a81d3855c440b3c961555.

Reason for revert: Breaks SSP tests due to wrong file path. Revert it to unblock drone push on next Mon.

Original change's description:
> Adding logging to lxc-start
>
> BUG=None
> TEST=None
>
> Change-Id: I7bbbd4c8444125119bc7691716a49ae6bd2ddbc7
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2748062
> Tested-by: jaquesc <jaquesc@google.com>
> Reviewed-by: Congbin Guo <guocb@chromium.org>
> Reviewed-by: jaquesc <jaquesc@google.com>
> Reviewed-by: Taylor Clark <taylormade@google.com>
> Auto-Submit: jaquesc <jaquesc@google.com>

Bug: None
Change-Id: Ifd1e9670f38d47cb8686c5b65afa716e335209a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2756903
Reviewed-by: Congbin Guo <guocb@chromium.org>
Commit-Queue: Congbin Guo <guocb@chromium.org>
Tested-by: Congbin Guo <guocb@chromium.org>

site_utils/lxc/container.py

diff --git a/site_utils/lxc/container.py b/site_utils/lxc/container.py
index 716ccf7..ef26e06 100644
--- a/site_utils/lxc/container.py
+++ b/site_utils/lxc/container.py
@@ -345,7 +345,7 @@
 
     @metrics.SecondsTimerDecorator(
         '%s/container_start_duration' % constants.STATS_KEY)
-    def start(self, result_dir, wait_for_network=True):
+    def start(self, wait_for_network=True):
         """Start the container.
 
         @param wait_for_network: True to wait for network to be up. Default is
@@ -353,9 +353,7 @@
 
         @raise ContainerError: If container does not exist, or fails to start.
         """
-        cmd = 'sudo lxc-start -P %s -n %s -d --logpriority=DEBUG -L %s' % (
-                self.container_path, self.name,
-                os.path.join(result_dir, 'ssp_logs/debug/lxc-console.log'))
+        cmd = 'sudo lxc-start -P %s -n %s -d' % (self.container_path, self.name)
         output = utils.run(cmd).stdout
         if not self.is_running():
             raise error.ContainerError(

site_utils/lxc/container_bucket.py

diff --git a/site_utils/lxc/container_bucket.py b/site_utils/lxc/container_bucket.py
index 525f30d..93b0f2e 100644
--- a/site_utils/lxc/container_bucket.py
+++ b/site_utils/lxc/container_bucket.py
@@ -274,8 +274,7 @@
         utils.run('sudo chown -R root "%s"' % autotest_path)
         utils.run('sudo chgrp -R root "%s"' % autotest_path)
 
-        container.start(constants.RESULT_DIR_FMT % job_folder,
-                        wait_for_network=True)
+        container.start(wait_for_network=True)
         deploy_config_manager.deploy_post_start()
 
         # Update the hostname of the test container to be `dut-name`.