[buildbot] phase1: remove unused 'git_ssh'
LEDE Commits
lede-commits at lists.infradead.org
Mon May 15 08:38:50 PDT 2023
ynezz pushed a commit to buildbot.git, branch master:
https://git.openwrt.org/0a58027c32b730c04a1be5d74e61f1607908bde1
commit 0a58027c32b730c04a1be5d74e61f1607908bde1
Author: Thibaut VARÈNE <hacks at slashdirt.org>
AuthorDate: Wed Oct 19 16:35:44 2022 +0200
phase1: remove unused 'git_ssh'
Signed-off-by: Thibaut VARÈNE <hacks at slashdirt.org>
---
phase1/config.ini.example | 7 -------
phase1/master.cfg | 38 +-------------------------------------
2 files changed, 1 insertion(+), 44 deletions(-)
diff --git a/phase1/config.ini.example b/phase1/config.ini.example
index ceeace4..1f500df 100644
--- a/phase1/config.ini.example
+++ b/phase1/config.ini.example
@@ -10,13 +10,6 @@ status_user = example
status_password = example
expire = 1209600
port = 9989
-git_ssh = true
-git_ssh_key = -----BEGIN RSA PRIVATE KEY-----
- MIIEpAIBAAKCAQEAuCJwo6OmrRDxcGfsMgBhq0vdzp2ZIdqnedFH8u6tVYLt9WDU
- ...
- mHzkh8Uv4OAWTjiLGycbXa0/31hu9PCeNzYmjjrp8tcGjsiJJFxydgS+wc0i2UPV
- nSI+JbmAAF9vw6gj2i+Hqx7UloRd0tEv/leX354T5lO06LMiNhvN9g==
- -----END RSA PRIVATE KEY-----
config_seed = # Seed configuration
CONFIG_BUILDBOT=y
CONFIG_DEVEL=y
diff --git a/phase1/master.cfg b/phase1/master.cfg
index 0c836d7..d61fc91 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -220,20 +220,9 @@ cxx_command = "g++"
config_seed = ""
-git_ssh = False
-git_ssh_key = None
-
if ini.has_option("phase1", "expire"):
tree_expire = ini.getint("phase1", "expire")
-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
-
if ini.has_option("phase1", "config_seed"):
config_seed = ini.get("phase1", "config_seed")
@@ -879,41 +868,16 @@ for target in targets:
mode = 0o755,
))
- # Git SSH
- 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",
- command="sed -e 's#https://#ssh://git@#g' feeds.conf.default > feeds.conf",
- haltOnFailure = True
- ))
-
# feed
factory.addStep(ShellCommand(
name = "updatefeeds",
description = "Updating feeds",
command=["./scripts/feeds", "update"],
- env = MakeEnv(tryccache=True, overrides={'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 {}),
+ env = MakeEnv(tryccache=True),
haltOnFailure = True,
locks = NetLockDl,
))
- # Git SSH
- if git_ssh:
- factory.addStep(ShellCommand(
- name = "rmfeedsconf",
- description = "Removing feeds.conf",
- command=["rm", "feeds.conf"],
- haltOnFailure = True
- ))
-
# feed
factory.addStep(ShellCommand(
name = "installfeeds",
More information about the lede-commits
mailing list