launchpad-reviewers team mailing list archive

[Tushar Gupta <mp+478373@xxxxxxxxxxxxxxxxxx>]

Tushar Gupta has proposed merging ~tushar5526/lpbuildbot-worker:add-more-logs-to-track-different-steps into lpbuildbot-worker:main.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~tushar5526/lpbuildbot-worker/+git/lpbuildbot-worker/+merge/478373
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~tushar5526/lpbuildbot-worker:add-more-logs-to-track-different-steps into lpbuildbot-worker:main.

diff --git a/charm/src/charm.py b/charm/src/charm.py
index 806fad7..e3dc5de 100755
--- a/charm/src/charm.py
+++ b/charm/src/charm.py
@@ -288,13 +288,11 @@ class LPBuildbotWorkerCharm(CharmBase):
         self._stored.ubuntu_series = ubuntu_series
 
     def _setup_launchpad_working_dir(self, series, workers_path, flavor=""):
-        flavor_suffix = "-" + flavor if flavor else ""
+        work_dir_name = "{}{}".format(series, "-" + flavor if flavor else "")
         self._set_maintenance_step(
-            "Making worker for {}{}".format(series, flavor_suffix)
-        )
-        base_path = workers_path / "{}{}-lxd-worker".format(
-            series, flavor_suffix
+            "Setting up work dir for {}".format(work_dir_name)
         )
+        base_path = workers_path / "{}-lxd-worker".format(work_dir_name)
         if not base_path.exists():
             self._run_as_buildbot(
                 ["mkdir", "-m755", "-p", str(base_path)], check=True
@@ -325,15 +323,25 @@ class LPBuildbotWorkerCharm(CharmBase):
         return base_path
 
     def _create_lxd_image(self, series, base_path, current_images, flavor=""):
-        if (
-            "lptests-{}{}".format(series, "-" + flavor if flavor else "")
-            not in current_images
-        ):
+        image_name = "lptests-{}{}".format(
+            series, "-" + flavor if flavor else ""
+        )
+        if image_name not in current_images:
+            self._set_maintenance_step(
+                "Creating image for {}".format(image_name)
+            )
             self._run_as_buildbot(
                 ["create-lp-tests-lxd", series, str(base_path)]
                 + ([flavor] if flavor else []),
                 check=True,
             )
+        else:
+            logging.info(
+                "Skipping image build for {} because it already \
+                    exists.".format(
+                    image_name
+                )
+            )
 
     def _on_install(self, event):
         self._install_lpbuildbot_worker()
diff --git a/charm/tests/test_charm.py b/charm/tests/test_charm.py
index 4cdaa33..8ed21be 100644
--- a/charm/tests/test_charm.py
+++ b/charm/tests/test_charm.py
@@ -242,8 +242,10 @@ def test_make_only_vanilla_ubuntu_workers(harness, fs, fp, fake_user):
 
     harness.charm._make_workers()
 
+    # We only have access to the last status that was set in
+    # _make_workers()
     assert harness.model.unit.status == MaintenanceStatus(
-        "Making worker for xenial"
+        "Creating image for lptests-xenial"
     )
     assert list(fp.calls) == [
         [