Skip to content
Snippets Groups Projects
Commit 6f847899 authored by Fabien FORESTIER's avatar Fabien FORESTIER
Browse files

Merge branch 'development' into 'master'

Add build tag on sonarqube job

See merge request !10
parents 352ec07a a2e21d4a
No related branches found
No related tags found
1 merge request!10Add build tag on sonarqube job
Pipeline #6875 passed
...@@ -7,6 +7,8 @@ variables: ...@@ -7,6 +7,8 @@ variables:
sonarqube: sonarqube:
stage: sonar-analysis stage: sonar-analysis
tags:
- build
only: only:
- master - master
before_script: before_script:
...@@ -32,10 +34,10 @@ build_development: ...@@ -32,10 +34,10 @@ build_development:
script: script:
- export TAG=$CI_COMMIT_SHORT_SHA - export TAG=$CI_COMMIT_SHORT_SHA
- export PROXY_QUERY_BIND_PORT=9002 - export PROXY_QUERY_BIND_PORT=9002
- docker-compose build - docker-compose build
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker-compose push - docker-compose push
- "curl -X POST -F token=$CI_JOB_TOKEN -F ref=master -F variables[TAG]=${TAG} https://forge.grandlyon.com/api/v4/projects/336/trigger/pipeline" - 'curl -X POST -F token=$CI_JOB_TOKEN -F ref=master -F variables[TAG]=${TAG} https://forge.grandlyon.com/api/v4/projects/336/trigger/pipeline'
build_release: build_release:
stage: build stage: build
...@@ -48,4 +50,4 @@ build_release: ...@@ -48,4 +50,4 @@ build_release:
- export PROXY_QUERY_BIND_PORT=9002 - export PROXY_QUERY_BIND_PORT=9002
- docker-compose build - docker-compose build
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker-compose push - docker-compose push
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment