From 6fc28a8f68388b8f604e8436d2b199c201b99bd4 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 30 Jun 2019 19:51:57 +0200 Subject: [PATCH] treewide: rename home_dir to work_dir Also default to current directory. Signed-off-by: Jo-Philipp Wich --- phase1/config.ini.example | 2 +- phase1/master.cfg | 20 ++++++++++---------- phase2/config.ini.example | 2 +- phase2/master.cfg | 24 ++++++++++++------------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/phase1/config.ini.example b/phase1/config.ini.example index c06edbd..3c7baf1 100644 --- a/phase1/config.ini.example +++ b/phase1/config.ini.example @@ -2,7 +2,7 @@ title = OpenWrt Project title_url = http://openwrt.org/ buildbot_url = http://phase1.builds.openwrt.org/ -homedir = . +workdir = /buildbot expire = 1209600 port = 9989 cc_version = le 4.9 diff --git a/phase1/master.cfg b/phase1/master.cfg index a99d945..7898760 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -94,7 +94,7 @@ c['logHorizon'] = 20 ####### CHANGESOURCES -home_dir = os.path.abspath(ini.get("general", "homedir")) +work_dir = os.path.abspath(ini.get("general", "workdir") or ".") scripts_dir = os.path.abspath("../scripts") tree_expire = 0 other_builds = 0 @@ -171,13 +171,13 @@ enable_kmod_archive = True # find targets targets = [ ] -if not os.path.isdir(home_dir+'/source.git'): - subprocess.call(["git", "clone", "--depth=1", "--branch="+repo_branch, repo_url, home_dir+'/source.git']) +if not os.path.isdir(work_dir+'/source.git'): + subprocess.call(["git", "clone", "--depth=1", "--branch="+repo_branch, repo_url, work_dir+'/source.git']) else: - subprocess.call(["git", "pull"], cwd = home_dir+'/source.git') + subprocess.call(["git", "pull"], cwd = work_dir+'/source.git') findtargets = subprocess.Popen([scripts_dir + '/dumpinfo.pl', 'targets'], - stdout = subprocess.PIPE, cwd = home_dir+'/source.git') + stdout = subprocess.PIPE, cwd = work_dir+'/source.git') while True: line = findtargets.stdout.readline() @@ -194,7 +194,7 @@ from buildbot.changes.gitpoller import GitPoller c['change_source'] = [] c['change_source'].append(GitPoller( repo_url, - workdir=home_dir+'/work.git', branch=repo_branch, + workdir=work_dir+'/work.git', branch=repo_branch, pollinterval=300)) ####### SCHEDULERS @@ -945,7 +945,7 @@ for target in targets: factory.addStep(MasterShellCommand( name = "signprepare", description = "Preparing temporary signing directory", - command = ["mkdir", "-p", "%s/signing" %(home_dir)], + command = ["mkdir", "-p", "%s/signing" %(work_dir)], haltOnFailure = True )) @@ -958,14 +958,14 @@ for target in targets: factory.addStep(FileUpload( slavesrc = "sign.tar.gz", - masterdest = "%s/signing/%s.%s.tar.gz" %(home_dir, ts[0], ts[1]), + masterdest = "%s/signing/%s.%s.tar.gz" %(work_dir, ts[0], ts[1]), haltOnFailure = True )) factory.addStep(MasterShellCommand( name = "signfiles", description = "Signing files", - command = ["%s/signall.sh" %(scripts_dir), "%s/signing/%s.%s.tar.gz" %(home_dir, ts[0], ts[1])], + command = ["%s/signall.sh" %(scripts_dir), "%s/signing/%s.%s.tar.gz" %(work_dir, ts[0], ts[1])], env = { 'GPGKEY': gpg_key, 'GPGPASS': gpg_passphrase, @@ -978,7 +978,7 @@ for target in targets: factory.addStep(FileDownload( name = "dlsigntargz", - mastersrc = "%s/signing/%s.%s.tar.gz" %(home_dir, ts[0], ts[1]), + mastersrc = "%s/signing/%s.%s.tar.gz" %(work_dir, ts[0], ts[1]), slavedest = "sign.tar.gz", haltOnFailure = True )) diff --git a/phase2/config.ini.example b/phase2/config.ini.example index c6192f4..3175c3c 100644 --- a/phase2/config.ini.example +++ b/phase2/config.ini.example @@ -2,7 +2,7 @@ title = OpenWrt Project title_url = http://openwrt.org/ buildbot_url = http://phase2.builds.openwrt.org/ -homedir = ../phase1 +workdir = /buildbot port = 9990 persistent = false git_ssh = true diff --git a/phase2/master.cfg b/phase2/master.cfg index bed036a..cfa7002 100644 --- a/phase2/master.cfg +++ b/phase2/master.cfg @@ -82,7 +82,7 @@ c['logHorizon'] = 20 ####### CHANGESOURCES -home_dir = os.path.abspath(ini.get("general", "homedir")) +work_dir = os.path.abspath(ini.get("general", "workdir") or ".") scripts_dir = os.path.abspath("../scripts") rsync_bin_url = ini.get("rsync", "binary_url") @@ -141,13 +141,13 @@ if ini.has_option("usign", "comment"): arches = [ ] archnames = [ ] -if not os.path.isdir(home_dir+'/source.git'): - subprocess.call(["git", "clone", "--depth=1", "--branch="+repo_branch, repo_url, home_dir+'/source.git']) +if not os.path.isdir(work_dir+'/source.git'): + subprocess.call(["git", "clone", "--depth=1", "--branch="+repo_branch, repo_url, work_dir+'/source.git']) else: - subprocess.call(["git", "pull"], cwd = home_dir+'/source.git') + subprocess.call(["git", "pull"], cwd = work_dir+'/source.git') findarches = subprocess.Popen([scripts_dir + '/dumpinfo.pl', 'architectures'], - stdout = subprocess.PIPE, cwd = home_dir+'/source.git') + stdout = subprocess.PIPE, cwd = work_dir+'/source.git') while True: line = findarches.stdout.readline() @@ -174,14 +174,14 @@ def parse_feed_entry(line): feedbranches[url[0]] = branch c['change_source'].append(GitPoller(url[0], branch=branch, workdir='%s/%s.git' %(os.getcwd(), parts[1]), pollinterval=300)) -make = subprocess.Popen(['make', '--no-print-directory', '-C', home_dir+'/source.git/target/sdk/', 'val.BASE_FEED'], - env = dict(os.environ, TOPDIR=home_dir+'/source.git'), stdout = subprocess.PIPE) +make = subprocess.Popen(['make', '--no-print-directory', '-C', work_dir+'/source.git/target/sdk/', 'val.BASE_FEED'], + env = dict(os.environ, TOPDIR=work_dir+'/source.git'), stdout = subprocess.PIPE) line = make.stdout.readline() if line: parse_feed_entry(line) -with open(home_dir+'/source.git/feeds.conf.default', 'r') as f: +with open(work_dir+'/source.git/feeds.conf.default', 'r') as f: for line in f: parse_feed_entry(line) @@ -458,7 +458,7 @@ for arch in arches: factory.addStep(MasterShellCommand( name = "signprepare", description = "Preparing temporary signing directory", - command = ["mkdir", "-p", "%s/signing" %(home_dir)], + command = ["mkdir", "-p", "%s/signing" %(work_dir)], haltOnFailure = True )) @@ -472,14 +472,14 @@ for arch in arches: factory.addStep(FileUpload( slavesrc = "sdk/sign.tar.gz", - masterdest = "%s/signing/%s.tar.gz" %(home_dir, arch[0]), + masterdest = "%s/signing/%s.tar.gz" %(work_dir, arch[0]), haltOnFailure = True )) factory.addStep(MasterShellCommand( name = "signfiles", description = "Signing files", - command = ["%s/signall.sh" %(scripts_dir), "%s/signing/%s.tar.gz" %(home_dir, arch[0])], + command = ["%s/signall.sh" %(scripts_dir), "%s/signing/%s.tar.gz" %(work_dir, arch[0])], env = { 'GPGKEY': gpg_key, 'GPGPASS': gpg_passphrase, @@ -491,7 +491,7 @@ for arch in arches: )) factory.addStep(FileDownload( - mastersrc = "%s/signing/%s.tar.gz" %(home_dir, arch[0]), + mastersrc = "%s/signing/%s.tar.gz" %(work_dir, arch[0]), slavedest = "sdk/sign.tar.gz", haltOnFailure = True )) -- 2.30.2