fablab-nea/labsync
1
0
Fork 0
Code Issues 11 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Fix python-gitlab not sorting jobs by id

Browse source
This commit is contained in:
jalr 2018-06-14 20:29:18 +02:00
parent bfff5648df
commit 6d35558299
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
security-scanner/security_scanner/gitlab.py
View file

@ -17,16 +17,18 @@ class GitLab:
def getLastSuccessfulJob(self, ref, name): def getLastSuccessfulJob(self, ref, name):
pipelines = self._project.pipelines.list() pipelines = self._project.pipelines.list()
successful_master_jobs = [] last_successful_job = None
for pipeline in pipelines: for pipeline in pipelines:
jobs = pipeline.jobs.list() jobs = pipeline.jobs.list()
for job in jobs: for job in jobs:
if job.ref == ref and job.attributes['name'] == name and job.attributes['status'] == 'success': if job.ref == ref and job.attributes['name'] == name and job.attributes['status'] == 'success':
successful_master_jobs.append(job) if last_successful_job is not None:
if job.attributes['id'] > last_successful_job.attributes['id']:
last_successful_job = job
else:
last_successful_job = job
job = successful_master_jobs[-1] return last_successful_job
return job
def downloadArtifact(self, job, sourcePath, destPath): def downloadArtifact(self, job, sourcePath, destPath):
job_id = job.attributes['id'] job_id = job.attributes['id']

3
security-scanner/security_scanner/main.py
View file

@ -29,9 +29,8 @@ def checkDebianDistro(distro):
return result return result
def main(argv): def main(argv):
gitlab = GitLab()
for distro in argv[1:]: for distro in argv[1:]:
#for distro in ['stretch']:
gitlab = GitLab()
job = gitlab.getLastSuccessfulJob('master', 'squashfs_master') job = gitlab.getLastSuccessfulJob('master', 'squashfs_master')
gitlab.downloadArtifact(job, 'images/debian-' + distro + '.dpkg-list', 'debian-' + distro + '.dpkg-list') gitlab.downloadArtifact(job, 'images/debian-' + distro + '.dpkg-list', 'debian-' + distro + '.dpkg-list')
if checkDebianDistro(distro) > 0: if checkDebianDistro(distro) > 0: