From 1018a9eeb83a67ee57dfb557682c7afe3776edf1 Mon Sep 17 00:00:00 2001 From: hyokeun Date: Fri, 3 Nov 2017 16:08:48 +0900 Subject: [PATCH] Fix dashboard update job fail After setting default ssh config, the job failed to communicate with gerrit command. Change-Id: I7f09f9f9a347a645f4bd107e5b52400fc0bef527 --- job_git_domain.py | 13 +++++++------ job_update_git_branch_project_mapping_for_dashboard.py | 8 +++++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/job_git_domain.py b/job_git_domain.py index 68a3afd..08eae27 100644 --- a/job_git_domain.py +++ b/job_git_domain.py @@ -47,8 +47,8 @@ def get_domain_group(g): # get_groups #================================================================================ def get_groups(): - cmd = "ssh -p %s %s gerrit ls-groups" % \ - (os.getenv('GERRIT_SSHPORT', 29418), os.getenv('GERRIT_HOSTNAME', "review.tizen.org")) + cmd = "ssh -p %s %s@%s gerrit ls-groups" % \ + (os.getenv('GERRIT_SSHPORT', 29418), os.getenv('GERRIT_USERNAME'), os.getenv('GERRIT_HOSTNAME', "review.tizen.org")) popen = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) (stdoutdata, stderrdata) = popen.communicate() @@ -58,8 +58,8 @@ def get_groups(): # get_projects #================================================================================ def get_projects(): - cmd = "ssh -p %s %s gerrit ls-projects --format json -t -b master -b refs/meta/config " % \ - (os.getenv('GERRIT_SSHPORT', 29418), os.getenv('GERRIT_HOSTNAME', "review.tizen.org")) + cmd = "ssh -p %s %s@%s gerrit ls-projects --format json -t -b master -b refs/meta/config " % \ + (os.getenv('GERRIT_SSHPORT', 29418), os.getenv('GERRIT_USERNAME'), os.getenv('GERRIT_HOSTNAME', "review.tizen.org")) popen = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) (stdoutdata, stderrdata) = popen.communicate() @@ -70,8 +70,8 @@ def get_projects(): #================================================================================ def get_group_members(g): g = g.replace(' ', '\ ') - cmd = "ssh -p %s %s gerrit ls-members \"%s\""%\ - (os.getenv('GERRIT_SSHPORT', 29418), os.getenv('GERRIT_HOSTNAME', "review.tizen.org"), g) + cmd = "ssh -p %s %s@%s gerrit ls-members \"%s\""%\ + (os.getenv('GERRIT_SSHPORT', 29418), os.getenv('GERRIT_USERNAME'), os.getenv('GERRIT_HOSTNAME', "review.tizen.org"), g) popen = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) (stdoutdata, stderrdata) = popen.communicate() @@ -223,3 +223,4 @@ sync_dest = os.path.join(os.getenv("IMG_SYNC_DEST_BASE"), "snapshots", target_di ret = sync(target_dir, sync_dest) if ret != 0: raise Exception("rsync failed. ret_code=%d"%ret) + diff --git a/job_update_git_branch_project_mapping_for_dashboard.py b/job_update_git_branch_project_mapping_for_dashboard.py index 13fbebe..6e9590e 100644 --- a/job_update_git_branch_project_mapping_for_dashboard.py +++ b/job_update_git_branch_project_mapping_for_dashboard.py @@ -43,9 +43,10 @@ def generate_mapping(prjdir, target_dir): branch_project_map = {} #proj_branch_info = gerrit.ls_projects() - cmd = "ssh -p %s %s gerrit ls-projects %s > proj_list" % (os.getenv('GERRIT_SSHPORT', 29418), - os.getenv('GERRIT_HOSTNAME', "review.tizen.org"), - arg) + cmd = "ssh -p %s %s@%s gerrit ls-projects %s > proj_list" % (os.getenv('GERRIT_SSHPORT', 29418), + os.getenv('GERRIT_USERNAME'), + os.getenv('GERRIT_HOSTNAME', "review.tizen.org"), + arg) subprocess.check_output(cmd, shell=True) with open("proj_list", "r") as f: for l in f: @@ -108,3 +109,4 @@ generate_mapping(prjdir, target_dir) sync_dest = os.path.join(os.getenv("IMG_SYNC_DEST_BASE"), "snapshots", target_dir) # sync to the download server. sync(target_dir, sync_dest) + -- 2.7.4