diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c6feeeb2eaa9ddae5ea272ceba544ee26f5fd793..7c63dbefeb1a2a538b9d7d9da0ec1e169291cba9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,7 @@ stages: - quality - test - build + - push-build - deploy - publish @@ -42,7 +43,7 @@ build_stack: - master - dev when: manual - + sonarqube-mr: stage: quality only: @@ -123,16 +124,15 @@ build-mr: - merge_requests artifacts: paths: - - build + - build/ -build-for-testing: - stage: build +push_to_test: + stage: push-build before_script: - apk add git - apk add bash script: - - yarn - - yarn build-dev + - ls build - git config --global user.name build-pipeline - git config --global user.email "$GIT_USER" - git config --global user.password "$GIT_PWD" @@ -142,17 +142,16 @@ build-for-testing: - yarn deploy-test only: - merge_requests + needs: + - build-mr when: manual - -build-dev-branch: - stage: build +push_to_dev: + stage: push-build before_script: - apk add git - apk add bash script: - - yarn - - yarn build-dev - git config --global user.name build-pipeline - git config --global user.email "$GIT_USER" - git config --global user.password "$GIT_PWD" @@ -162,15 +161,15 @@ build-dev-branch: - yarn deploy-dev only: - dev + needs: + - build-mr -build: - stage: build +push_to_master: + stage: push-build before_script: - apk add git - apk add bash script: - - yarn - - yarn build - git config --global user.name build-pipeline - git config --global user.email "$GIT_USER" - git config --global user.password "$GIT_PWD" @@ -181,15 +180,13 @@ build: only: - master -deploy-to-dev: +deploy_dev: stage: deploy tags: - deploy-alpha script: - cd /root/ecolyo-infra-scripts/cicid_scripts - './update_ecolyo_dev.sh' - dependencies: - - build-for-testing only: - merge_requests environment: @@ -197,7 +194,7 @@ deploy-to-dev: url: https://ecolyo.dev.cozy.self-data.alpha.grandlyon.com/ when: manual -deploy-to-ecolyodemo: +deploy_demo: stage: deploy tags: - deploy-alpha @@ -210,7 +207,7 @@ deploy-to-ecolyodemo: name: ecolyodemo url: https://ecolyo.ecolyodemo.cozy.self-data.alpha.grandlyon.com/ -deploy-to-all-instances: +deploy_all: stage: deploy tags: - deploy-alpha @@ -228,4 +225,4 @@ publish: - yarn cozyPublish only: - tags - when: manual \ No newline at end of file + when: manual