Skip to content
Snippets Groups Projects
Commit f622cbb2 authored by Alessio Igor Bogani's avatar Alessio Igor Bogani
Browse files

A couple of minor changes

parent 54933e8d
No related branches found
No related tags found
No related merge requests found
...@@ -12,6 +12,7 @@ import sys ...@@ -12,6 +12,7 @@ import sys
import logging import logging
import logging.handlers import logging.handlers
import argparse import argparse
import datetime
import subprocess import subprocess
import paramiko import paramiko
import hashlib import hashlib
...@@ -145,11 +146,11 @@ class Builder: ...@@ -145,11 +146,11 @@ class Builder:
else: else:
raiseException('Invalid type') raiseException('Invalid type')
artifacts = []
for r, d, f in os.walk(basedir): for r, d, f in os.walk(basedir):
dir = "" dir = ""
if r != basedir: if r != basedir:
dir = os.path.basename(r) + "/" dir = os.path.basename(r) + "/"
artifacts = []
for file in f: for file in f:
hashFile = "" hashFile = ""
with open(basedir + dir + file,"rb") as fd: with open(basedir + dir + file,"rb") as fd:
...@@ -157,9 +158,9 @@ class Builder: ...@@ -157,9 +158,9 @@ class Builder:
hashFile = hashlib.sha256(bytes).hexdigest(); hashFile = hashlib.sha256(bytes).hexdigest();
if not os.path.isfile(args.store + hashFile): if not os.path.isfile(args.store + hashFile):
shutil.copyfile(basedir + dir + file, args.store + hashFile, follow_symlinks=False) shutil.copyfile(basedir + dir + file, args.store + hashFile, follow_symlinks=False)
artifacts.append(db.Artifacts(build_id=job.build_id, hash=hashFile, filename=dir+file)) artifacts.append(db.Artifacts(build_id=job.build_id, hash=hashFile, filename=dir+file))
session.add_all(artifacts) session.add_all(artifacts)
session.commit() session.commit()
sendEmail(session, job.emails, outcome, output) sendEmail(session, job.emails, outcome, output)
...@@ -310,7 +311,7 @@ class Server(BaseHTTPRequestHandler): ...@@ -310,7 +311,7 @@ class Server(BaseHTTPRequestHandler):
session.close() session.close()
return return
builds.append(db.Builds(repository_id=r.id, platform_id=r.platform_id, tag=post_json['ref'])) builds.append(db.Builds(repository_id=r.id, platform_id=r.platform_id, tag=os.path.basename(post_json['ref'])))
if not builds: if not builds:
self.send_response(404) self.send_response(404)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment