YunoHost/yunorunner
1
0
Fork 0
mirror of https://github.com/YunoHost/yunorunner.git synced 2024-09-03 20:05:52 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] add CI type and option to now monitor app list

Browse source
This commit is contained in:
Laurent Peuch 2018-08-29 00:57:11 +02:00
parent d8fc02a0c9
commit dd28f754b3
2 changed files with 43 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cli.py
View file

@ -79,6 +79,7 @@ def list_(all=False, domain=DOMAIN):
for i in response.json(): for i in response.json():
print(f"{i['id']:4d} - {i['name']}") print(f"{i['id']:4d} - {i['name']}")
def delete(job_id, domain=DOMAIN): pass def delete(job_id, domain=DOMAIN): pass
def update(job_id, domain=DOMAIN): pass def update(job_id, domain=DOMAIN): pass
def stop(job_id, domain=DOMAIN): pass def stop(job_id, domain=DOMAIN): pass

65
run.py
View file

@ -103,9 +103,42 @@ def reset_busy_workers():
Worker.update(state="available").execute() Worker.update(state="available").execute()
async def monitor_apps_lists(): async def create_job(app_id, app_list_name, repo, job_command_last_part):
if isinstance(job_command_last_part, str):
job = Job.create(
name=f"{app_id} ({app_list_name})" + job_command_last_part,
url_or_path=repo.url,
state="scheduled",
)
await broadcast({
"action": "new_job",
"data": model_to_dict(job),
}, "jobs")
else:
for i in job_command_last_part:
job = Job.create(
name=f"{app_id} ({app_list_name})" + i,
url_or_path=repo.url,
state="scheduled",
)
await broadcast({
"action": "new_job",
"data": model_to_dict(job),
}, "jobs")
async def monitor_apps_lists(type="stable"):
"parse apps lists every hour or so to detect new apps" "parse apps lists every hour or so to detect new apps"
job_command_last_part = ""
if type == "arm":
job_command_last_part = " (~ARM~)"
elif type == "testing-unstable":
job_command_last_part = [" (testing)", " (unstable)"]
# only support github for now :( # only support github for now :(
async def get_master_commit_sha(url): async def get_master_commit_sha(url):
command = await asyncio.create_subprocess_shell(f"git ls-remote {url} master", stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE) command = await asyncio.create_subprocess_shell(f"git ls-remote {url} master", stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE)
@ -138,16 +171,7 @@ async def monitor_apps_lists():
repo.revision = commit_sha repo.revision = commit_sha
repo.save() repo.save()
job = Job.create( await create_job(app_id, app_list_name, repo, job_command_last_part)
name=f"{app_id} ({app_list_name})",
url_or_path=repo.url,
state="scheduled",
)
await broadcast({
"action": "new_job",
"data": model_to_dict(job),
}, "jobs")
# new app # new app
else: else:
@ -159,16 +183,7 @@ async def monitor_apps_lists():
app_list=app_list_name, app_list=app_list_name,
) )
job = Job.create( await create_job(app_id, app_list_name, repo, job_command_last_part)
name=f"{app_id} ({app_list_name})",
url_or_path=repo.url,
state="scheduled",
)
await broadcast({
"action": "new_job",
"data": model_to_dict(job),
}, "jobs")
await asyncio.sleep(3) await asyncio.sleep(3)
@ -461,12 +476,16 @@ async def index(request):
return {'relative_path_to_root': '', 'path': request.path} return {'relative_path_to_root': '', 'path': request.path}
def main(path_to_analyseCI, ssl=False, keyfile_path="/etc/yunohost/certs/ci-apps.yunohost.org/key.pem", certfile_path="/etc/yunohost/certs/ci-apps.yunohost.org/crt.pem"): @argh.arg('-t', '--type', choices=['stable', 'arm', 'testing-unstable', 'dev'], default="stable")
def main(path_to_analyseCI, ssl=False, keyfile_path="/etc/yunohost/certs/ci-apps.yunohost.org/key.pem", certfile_path="/etc/yunohost/certs/ci-apps.yunohost.org/crt.pem", type="stable", dont_minotor_apps_list=False):
reset_pending_jobs() reset_pending_jobs()
reset_busy_workers() reset_busy_workers()
app.config.path_to_analyseCI = path_to_analyseCI app.config.path_to_analyseCI = path_to_analyseCI
app.add_task(monitor_apps_lists())
if not dont_minotor_apps_list:
app.add_task(monitor_apps_lists(type=type))
app.add_task(jobs_dispatcher()) app.add_task(jobs_dispatcher())
if not ssl: if not ssl: