Skip to content
Snippets Groups Projects
Commit cee5829a authored by Rémi PAILHAREY's avatar Rémi PAILHAREY :fork_knife_plate:
Browse files

chore: use factory group token

parent 54311ebe
No related branches found
No related tags found
1 merge request!108chore(release): Ecolyo 3.1.0
Pipeline #100736 passed
...@@ -12,7 +12,6 @@ default: ...@@ -12,7 +12,6 @@ default:
services: services:
- docker:dind - docker:dind
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "" DOCKER_TLS_CERTDIR: ""
...@@ -43,7 +42,7 @@ import-convert-assets: ...@@ -43,7 +42,7 @@ import-convert-assets:
- curl "https://forge.grandlyon.com/api/v4/projects/409/repository/archive?path=src/assets/icons/visu/ecogesture&sha=$ECOLYO_ASSETS_BRANCH" --output ecogesture.tar.gz - curl "https://forge.grandlyon.com/api/v4/projects/409/repository/archive?path=src/assets/icons/visu/ecogesture&sha=$ECOLYO_ASSETS_BRANCH" --output ecogesture.tar.gz
- tar -xf ecogesture.tar.gz - tar -xf ecogesture.tar.gz
- cd *-ecogesture/src/assets/icons/visu/ecogesture - cd *-ecogesture/src/assets/icons/visu/ecogesture
- for file in *.svg; do inkscape --export-type="png" $file; done - for file in *.svg; do inkscape --export-type="png" $file; done
- rm *.svg - rm *.svg
# Cleanup # Cleanup
- cd ~ - cd ~
...@@ -55,9 +54,9 @@ import-convert-assets: ...@@ -55,9 +54,9 @@ import-convert-assets:
- cp -r image-lib $CI_PROJECT_DIR/image-lib - cp -r image-lib $CI_PROJECT_DIR/image-lib
artifacts: artifacts:
paths: paths:
- $CI_PROJECT_DIR/image-lib - $CI_PROJECT_DIR/image-lib
only: only:
- master - master
when: manual when: manual
...@@ -90,10 +89,10 @@ sonarqube: ...@@ -90,10 +89,10 @@ sonarqube:
- dev - dev
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/sonarsource/sonar-scanner-cli:4 image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/sonarsource/sonar-scanner-cli:4
variables: variables:
SONAR_USER_HOME: '${CI_PROJECT_DIR}/.sonar' # Defines the location of the analysis task cache SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache
GIT_DEPTH: '0' # T GIT_DEPTH: "0" # T
cache: cache:
key: '${CI_JOB_NAME}' key: "${CI_JOB_NAME}"
paths: paths:
- .sonar/cache - .sonar/cache
script: script:
...@@ -115,10 +114,10 @@ sonarqube-mr: ...@@ -115,10 +114,10 @@ sonarqube-mr:
- merge_requests - merge_requests
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/sonarsource/sonar-scanner-cli:4 image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/sonarsource/sonar-scanner-cli:4
variables: variables:
SONAR_USER_HOME: '${CI_PROJECT_DIR}/.sonar' # Defines the location of the analysis task cache SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache
GIT_DEPTH: '0' # T GIT_DEPTH: "0" # T
cache: cache:
key: '${CI_JOB_NAME}' key: "${CI_JOB_NAME}"
paths: paths:
- .sonar/cache - .sonar/cache
script: script:
...@@ -151,8 +150,8 @@ deploy_rec: ...@@ -151,8 +150,8 @@ deploy_rec:
script: script:
- find k8s/ -name '*.yml' -exec sed -i "s/{{NS}}/$NAMESPACE/g" {} \; - find k8s/ -name '*.yml' -exec sed -i "s/{{NS}}/$NAMESPACE/g" {} \;
- oc create secret -n $NAMESPACE docker-registry llle-project --docker-server=$CI_REGISTRY --docker-username=llle-project --docker-password=$TOKEN_PULL_IMAGE --dry-run=client -o yaml | oc apply -f - - oc create secret -n $NAMESPACE docker-registry llle-project --docker-server=$CI_REGISTRY --docker-username=llle-project --docker-password=$READ_REGISTRY_TOKEN --dry-run=client -o yaml | oc apply -f -
- oc apply -f k8s/secrets - oc apply -f k8s/secrets
- oc apply -f k8s/deployments - oc apply -f k8s/deployments
- oc apply -f k8s/cronjobs - oc apply -f k8s/cronjobs
...@@ -181,8 +180,8 @@ deploy_prod: ...@@ -181,8 +180,8 @@ deploy_prod:
script: script:
- find k8s/ -name '*.yml' -exec sed -i "s/{{NS}}/$NAMESPACE/g" {} \; - find k8s/ -name '*.yml' -exec sed -i "s/{{NS}}/$NAMESPACE/g" {} \;
- oc create secret -n $NAMESPACE docker-registry llle-project --docker-server=$CI_REGISTRY --docker-username=llle-project --docker-password=$TOKEN_PULL_IMAGE --dry-run=client -o yaml | oc apply -f - - oc create secret -n $NAMESPACE docker-registry llle-project --docker-server=$CI_REGISTRY --docker-username=llle-project --docker-password=$READ_REGISTRY_TOKEN --dry-run=client -o yaml | oc apply -f -
- oc apply -f k8s/secrets - oc apply -f k8s/secrets
- oc apply -f k8s/deployments - oc apply -f k8s/deployments
- oc apply -f k8s/cronjobs - oc apply -f k8s/cronjobs
...@@ -191,6 +190,3 @@ deploy_prod: ...@@ -191,6 +190,3 @@ deploy_prod:
- ns-ecolyo-bo-p01-syn - ns-ecolyo-bo-p01-syn
only: only:
- master - master
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment