From: hyokeun Date: Thu, 5 Apr 2018 11:00:46 +0000 (+0900) Subject: GBS - Adding Worker info X-Git-Tag: submit/trunk/20190927.012743~95 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=80647a9d8422abc64bd679ddf261230a81571bf2;p=services%2Fjenkins-scripts.git GBS - Adding Worker info Change-Id: I75a018bb80db3bdab3bd7cab8e63777e32573fe6 --- diff --git a/job_gbsfullbuild_image_creator.py b/job_gbsfullbuild_image_creator.py index 5410f6f..ca710ba 100755 --- a/job_gbsfullbuild_image_creator.py +++ b/job_gbsfullbuild_image_creator.py @@ -46,15 +46,16 @@ def find_my_ip(): return '0.0.0.0' def gbs_update_dashboard(raw_data, via='trigger', trigger_name=''): - raw_data["_timestamp"] = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S") raw_data["_worker"] = {"node_name": os.getenv('NODE_NAME'), - "build_job": os.getenv('JOB_NAME'), - "build_number": os.getenv('BUILD_ID'), - "ip": find_my_ip()} - + "build_job": os.getenv('JOB_NAME'), + "build_number": os.getenv('BUILD_ID'), + "ip": find_my_ip()} if via == 'trigger': - trigger_next("DASHBOARD_UPDATE_%s" % trigger_name, raw_data) + if trigger_name: + trigger_next("DASHBOARD_UPDATE_%s" % trigger_name, raw_data) + else: + trigger_next("DASHBOARD_UPDATE_%s" % raw_data.get("tag").replace('/', '_'), raw_data) else: try: encoded_data = base64.b64encode(json.dumps(raw_data)) @@ -64,8 +65,7 @@ def gbs_update_dashboard(raw_data, via='trigger', trigger_name=''): jobname=os.getenv('DASHBOARD_UPDATE_JOB_NAME', 'BUILD-MONITOR-GBS'), \ data='TRIGGER_INFO="%s"' % (quote_plus(encoded_data))) except Exception as err: - trigger_next("DASHBOARD_UPDATE_%s" % trigger_name, raw_data) - + trigger_next("DASHBOARD_UPDATE_%s" % raw_data.get("tag").replace('/', '_'), raw_data) # Returns the list of baseurls from kickstart configuration. def get_base_url(kickstart,buildid): @@ -463,3 +463,4 @@ def main(): if __name__ == "__main__": sys.exit(main()) +