Skip to content

Commit

Permalink
phase2: remove unused git_ssh plumbing
Browse files Browse the repository at this point in the history
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
  • Loading branch information
f00b4r0 authored and ynezz committed Nov 16, 2023
1 parent 2d247f8 commit 40a52f0
Showing 1 changed file with 0 additions and 33 deletions.
33 changes: 0 additions & 33 deletions phase2/master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -62,23 +62,13 @@ 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")

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()

Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 40a52f0

Please sign in to comment.