launchpad-reviewers team mailing list archive

[Colin Watson <mp+429237@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/lpbuildbot-worker:charm-remove-sourcecode into lpbuildbot-worker:main.

Commit message:
charm: Stop creating sourcecode directory

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lpbuildbot-worker/+git/lpbuildbot-worker/+merge/429237

Launchpad no longer needs this.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lpbuildbot-worker:charm-remove-sourcecode into lpbuildbot-worker:main.

diff --git a/README.md b/README.md
index 46f6fc9..559d71b 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,6 @@ grep root:112:1 /etc/subuid -qs || sudo usermod --add-subuids 112-112 --add-subg
 sudo su buildbot
 cd /var/lib/buildbot/slaves/xenial-lxd-worker
 git clone https://git.launchpad.net/launchpad devel
-mkdir -p dependencies/sourcecode
 cd dependencies
 git clone https://git.launchpad.net/lp-source-dependencies download-cache
 create-lp-tests-lxd xenial /var/lib/buildbot/slaves/xenial-lxd-worker/
diff --git a/charm/src/charm.py b/charm/src/charm.py
index 8bcecfb..2fe3960 100755
--- a/charm/src/charm.py
+++ b/charm/src/charm.py
@@ -211,7 +211,6 @@ class LPBuildbotWorkerCharm(CharmBase):
                 )
             lp_path = base_path / "devel"
             dependencies_path = base_path / "dependencies"
-            sourcecode_path = dependencies_path / "sourcecode"
             download_cache_path = dependencies_path / "download-cache"
             if not lp_path.exists():
                 self._run_as_buildbot(
@@ -223,10 +222,6 @@ class LPBuildbotWorkerCharm(CharmBase):
                     ],
                     check=True,
                 )
-            if not sourcecode_path.exists():
-                self._run_as_buildbot(
-                    ["mkdir", "-m755", "-p", str(sourcecode_path)], check=True
-                )
             if not download_cache_path.exists():
                 self._run_as_buildbot(
                     [
diff --git a/charm/tests/test_charm.py b/charm/tests/test_charm.py
index 08d67df..f3efcd0 100644
--- a/charm/tests/test_charm.py
+++ b/charm/tests/test_charm.py
@@ -274,16 +274,6 @@ def test_make_workers(harness, fs, fp, fake_user):
             "sudo",
             "-Hu",
             "buildbot",
-            "mkdir",
-            "-m755",
-            "-p",
-            "/var/lib/buildbot/slaves/xenial-lxd-worker/"
-            "dependencies/sourcecode",
-        ],
-        [
-            "sudo",
-            "-Hu",
-            "buildbot",
             "git",
             "clone",
             "https://git.launchpad.net/lp-source-dependencies";,