[buildbot] phase2: remove unused git_ssh plumbing
LEDE Commits
lede-commits at lists.infradead.org
Thu Nov 16 03:48:46 PST 2023
ynezz pushed a commit to buildbot.git, branch master:
https://git.openwrt.org/40a52f094878654307015ce150ca13947bdfa2d1
commit 40a52f094878654307015ce150ca13947bdfa2d1
Author: Thibaut VARÈNE <hacks at slashdirt.org>
AuthorDate: Wed Nov 15 15:12:17 2023 +0100
phase2: remove unused git_ssh plumbing
Signed-off-by: Thibaut VARÈNE <hacks at slashdirt.org>
---
phase2/master.cfg | 33 ---------------------------------
1 file changed, 33 deletions(-)
diff --git a/phase2/master.cfg b/phase2/master.cfg
index a499f72..ae994cd 100644
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -62,8 +62,6 @@ c = BuildmasterConfig = {}
worker_port = 9990
persistent = False
-git_ssh = False
-git_ssh_key = None
if ini.has_option("phase2", "port"):
worker_port = ini.get("phase2", "port")
@@ -71,14 +69,6 @@ if ini.has_option("phase2", "port"):
if ini.has_option("phase2", "persistent"):
persistent = ini.getboolean("phase2", "persistent")
-if ini.has_option("general", "git_ssh"):
- git_ssh = ini.getboolean("general", "git_ssh")
-
-if ini.has_option("general", "git_ssh_key"):
- git_ssh_key = ini.get("general", "git_ssh_key")
-else:
- git_ssh = False
-
c['workers'] = []
max_builds = dict()
@@ -555,36 +545,13 @@ for arch in arches:
command = ["./ccache.sh"],
haltOnFailure = True))
- if git_ssh:
- factory.addStep(StringDownload(
- name = "dlgitclonekey",
- s = git_ssh_key,
- workerdest = "../git-clone.key",
- mode = 0o600))
-
- factory.addStep(ShellCommand(
- name = "patchfeedsconf",
- description = "Patching feeds.conf",
- workdir = "build/sdk",
- command = "sed -e 's#https://#ssh://git@#g' feeds.conf.default > feeds.conf",
- haltOnFailure = True))
-
factory.addStep(ShellCommand(
name = "updatefeeds",
description = "Updating feeds",
workdir = "build/sdk",
command = ["./scripts/feeds", "update", "-f"],
- env = {'GIT_SSH_COMMAND': Interpolate("ssh -o IdentitiesOnly=yes -o IdentityFile=%(kw:cwd)s/git-clone.key -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no", cwd=GetCwd)} if git_ssh else {},
haltOnFailure = True))
- if git_ssh:
- factory.addStep(ShellCommand(
- name = "rmfeedsconf",
- description = "Removing feeds.conf",
- workdir = "build/sdk",
- command=["rm", "feeds.conf"],
- haltOnFailure = True))
-
factory.addStep(ShellCommand(
name = "installfeeds",
description = "Installing feeds",
More information about the lede-commits
mailing list