diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90684582b6cd80e70122727683a48be50a59aa83..f4a4de49a4973bc0c6737de1361118fa5381e2ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,6 @@ default: services: - docker:dind - variables: DOCKER_DRIVER: overlay2 DOCKER_TLS_CERTDIR: "" @@ -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 - tar -xf ecogesture.tar.gz - 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 # Cleanup - cd ~ @@ -55,9 +54,9 @@ import-convert-assets: - cp -r image-lib $CI_PROJECT_DIR/image-lib artifacts: paths: - - $CI_PROJECT_DIR/image-lib + - $CI_PROJECT_DIR/image-lib - only: + only: - master when: manual @@ -90,10 +89,10 @@ sonarqube: - dev image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/sonarsource/sonar-scanner-cli:4 variables: - SONAR_USER_HOME: '${CI_PROJECT_DIR}/.sonar' # Defines the location of the analysis task cache - GIT_DEPTH: '0' # T + SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache + GIT_DEPTH: "0" # T cache: - key: '${CI_JOB_NAME}' + key: "${CI_JOB_NAME}" paths: - .sonar/cache script: @@ -115,10 +114,10 @@ sonarqube-mr: - merge_requests image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/sonarsource/sonar-scanner-cli:4 variables: - SONAR_USER_HOME: '${CI_PROJECT_DIR}/.sonar' # Defines the location of the analysis task cache - GIT_DEPTH: '0' # T + SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache + GIT_DEPTH: "0" # T cache: - key: '${CI_JOB_NAME}' + key: "${CI_JOB_NAME}" paths: - .sonar/cache script: @@ -151,8 +150,8 @@ deploy_rec: script: - 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/deployments - oc apply -f k8s/cronjobs @@ -181,8 +180,8 @@ deploy_prod: script: - 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/deployments - oc apply -f k8s/cronjobs @@ -191,6 +190,3 @@ deploy_prod: - ns-ecolyo-bo-p01-syn only: - master - - -