Skip to content
Snippets Groups Projects
Commit 46ab52df authored by Éloïs's avatar Éloïs
Browse files

Merge branch 'BadReleaseLink' into 1.6

parents c7ddd4b3 7032516c
Branches
Tags
No related merge requests found
stages: stages:
- github-sync - github-sync
- build - build
- test
- package - package
- prerelease - prerelease
- release - release
...@@ -39,13 +38,6 @@ build: ...@@ -39,13 +38,6 @@ build:
script: script:
- yarn - yarn
test:
<<: *nvm_env
stage: test
script:
- yarn
- yarn test
.build_releases: &build_releases .build_releases: &build_releases
stage: package stage: package
allow_failure: false allow_failure: false
......
...@@ -33,5 +33,5 @@ class BinArtifact(Artifact): ...@@ -33,5 +33,5 @@ class BinArtifact(Artifact):
return FSItemSize(int(os.path.getsize(self.file_name))) return FSItemSize(int(os.path.getsize(self.file_name)))
def _build_url(self): def _build_url(self):
return '{}/-/jobs/artifacts/{}/raw/{}?job={}'.format( return '{}/-/jobs/{}/artifacts/raw/{}'.format(
os.environ['CI_PROJECT_URL'], self.tag, self.file_name, self.job) os.environ['CI_PROJECT_URL'], self.job, self.file_name)
import json
import os
import urllib.request
from projectapi import ProjectApi
class Pipeline(ProjectApi):
'''
Pipeline data API.
'''
def __init__(self):
ProjectApi.__init__(self, '/pipelines/{}'.format(os.environ['CI_PIPELINE_ID']))
def find_job_id(self, job_name):
'''
Find the id corresponding to given job name in the pipeline.
:param job_name: The job name.
:type job_name: str
:return: The identifier.
:rtype: int
'''
request = self.build_request('/jobs')
response = urllib.request.urlopen(request)
response_data = response.read().decode()
for job in json.loads(response_data):
if job['name'] == job_name: return job['id']
print('CRITICAL No job with given name {} found'.format(job_name))
exit(1)
...@@ -5,7 +5,6 @@ import os ...@@ -5,7 +5,6 @@ import os
from binartifact import BinArtifact from binartifact import BinArtifact
from job import Job from job import Job
from pipeline import Pipeline
from placeholder import PlaceHolder from placeholder import PlaceHolder
from releasenote import ReleaseNote from releasenote import ReleaseNote
from releasewikipage import ReleaseWikiPage from releasewikipage import ReleaseWikiPage
...@@ -91,7 +90,6 @@ class Releaser: ...@@ -91,7 +90,6 @@ class Releaser:
for artifact in self._get_bin_artifacts(): for artifact in self._get_bin_artifacts():
if not artifact.job in jobs: if not artifact.job in jobs:
jobs.append(artifact.job) jobs.append(artifact.job)
jobs = map(lambda j: Pipeline().find_job_id(j), jobs)
for job_id in jobs: Job(job_id).keep_artifacts() for job_id in jobs: Job(job_id).keep_artifacts()
print('Release published') print('Release published')
......
...@@ -59,7 +59,7 @@ create_desc() { ...@@ -59,7 +59,7 @@ create_desc() {
cat >"${1}".desc <<-EOF cat >"${1}".desc <<-EOF
{ {
"version": "${DUNITER_TAG}", "version": "${DUNITER_TAG}",
"job": "${CI_JOB_NAME}", "job": "${CI_JOB_ID}",
"type": "${2^}", "type": "${2^}",
"category": "${3}", "category": "${3}",
"arch": "x64" "arch": "x64"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment