diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d75bd05da15a7dd66f0c65fee3450f34f25ab961..d649c2aa3a3d4ee4ff834d2e7750249968b69c88 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,6 @@ stages: - github-sync - build - - test - package - prerelease - release @@ -39,13 +38,6 @@ build: script: - yarn -test: - <<: *nvm_env - stage: test - script: - - yarn - - yarn test - .build_releases: &build_releases stage: package allow_failure: false diff --git a/.gitlab/releaser/binartifact.py b/.gitlab/releaser/binartifact.py index 45c617a6c07655796b5a7f087120e8dd27d2d071..cc3ab04e05fa1386e93d745ff610dd5ea9def5a4 100644 --- a/.gitlab/releaser/binartifact.py +++ b/.gitlab/releaser/binartifact.py @@ -33,5 +33,5 @@ class BinArtifact(Artifact): return FSItemSize(int(os.path.getsize(self.file_name))) def _build_url(self): - return '{}/-/jobs/artifacts/{}/raw/{}?job={}'.format( - os.environ['CI_PROJECT_URL'], self.tag, self.file_name, self.job) + return '{}/-/jobs/{}/artifacts/raw/{}'.format( + os.environ['CI_PROJECT_URL'], self.job, self.file_name) diff --git a/.gitlab/releaser/pipeline.py b/.gitlab/releaser/pipeline.py deleted file mode 100644 index 48e72216e90fcefc669b3c6c03338c64db5a2f69..0000000000000000000000000000000000000000 --- a/.gitlab/releaser/pipeline.py +++ /dev/null @@ -1,29 +0,0 @@ -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) diff --git a/.gitlab/releaser/releaser.py b/.gitlab/releaser/releaser.py index 125be7649ed844b5ba1709bfd89381edfb16058a..dca04456186c0c187cdb899c67ee6f8dd58c5429 100644 --- a/.gitlab/releaser/releaser.py +++ b/.gitlab/releaser/releaser.py @@ -5,7 +5,6 @@ import os from binartifact import BinArtifact from job import Job -from pipeline import Pipeline from placeholder import PlaceHolder from releasenote import ReleaseNote from releasewikipage import ReleaseWikiPage @@ -91,7 +90,6 @@ class Releaser: for artifact in self._get_bin_artifacts(): if not artifact.job in jobs: jobs.append(artifact.job) - jobs = map(lambda j: Pipeline().find_job_id(j), jobs) for job_id in jobs: Job(job_id).keep_artifacts() print('Release published') diff --git a/release/arch/linux/build-lin.sh b/release/arch/linux/build-lin.sh index b06938b45714bce9f5f8c64cc4007c097bbe4c39..404135125e5fc3d1926d35c9e355243eb302e7df 100644 --- a/release/arch/linux/build-lin.sh +++ b/release/arch/linux/build-lin.sh @@ -59,7 +59,7 @@ create_desc() { cat >"${1}".desc <<-EOF { "version": "${DUNITER_TAG}", - "job": "${CI_JOB_NAME}", + "job": "${CI_JOB_ID}", "type": "${2^}", "category": "${3}", "arch": "x64"