Skip to content
Snippets Groups Projects
Commit 275430b1 authored by Alexis POYEN's avatar Alexis POYEN
Browse files

Merge branch 'develop' into 'release'

CI: migrate from only/except to rules

See merge request !14
parents 46021154 bdaf27ef
No related branches found
No related tags found
2 merge requests!15Release,!14CI: migrate from only/except to rules
Pipeline #105484 passed
......@@ -12,7 +12,7 @@ stages:
build-back:
stage: build
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:16.11.1-alpine
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:22.1-alpine
script:
- cd back
- npm i
......@@ -21,10 +21,11 @@ build-back:
paths:
- ./back/node_modules
expire_in: 1h
only:
changes:
- .gitlab-ci.yml
- back/**/*
rules:
- if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "release" && $CI_PIPELINE_SOURCE != "merge_request_event"
changes:
- .gitlab-ci.yml
- back/**/*
# *********************************************************************************************
# * TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST *
......@@ -33,7 +34,7 @@ build-back:
test-back:
stage: test
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:16.11.1-alpine
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:22.1-alpine
script:
- cd back
- npm run test:cov
......@@ -41,10 +42,11 @@ test-back:
paths:
- ./back/coverage/lcov.info
expire_in: 5 mins
only:
changes:
- .gitlab-ci.yml
- back/**/*
rules:
- if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "release" && $CI_PIPELINE_SOURCE != "merge_request_event"
changes:
- .gitlab-ci.yml
- back/**/*
# *********************************************************************************************
# * SONAR SONAR SONAR SONAR SONAR SONAR SONAR SONAR SONAR SONAR SONAR SONAR SONAR SONAR SONAR *
......@@ -62,7 +64,7 @@ sonarqube-back:
- npm install --save sonar-scanner
image:
name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/sonarsource/sonar-scanner-cli:4
entrypoint: [""]
entrypoint: ['']
variables:
SONAR_URL: http://sonarqube.forge.grandlyon.com:9000
GIT_STRATEGY: clone
......@@ -92,7 +94,7 @@ default:
alias: docker
variables:
DOCKER_TLS_CERTDIR: ""
DOCKER_TLS_CERTDIR: ''
DOCKER_HOST: tcp://docker:2375/
DOCKER_DRIVER: overlay2
DEPENDENCY_PROXY: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/
......@@ -102,12 +104,11 @@ variables:
docker-backend-master:
stage: docker
only:
refs:
- master
changes:
- .gitlab-ci.yml
- back/**/*
rules:
- if: $CI_COMMIT_BRANCH == "master"
changes:
- .gitlab-ci.yml
- back/**/*
before_script:
- docker info
- docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
......@@ -121,12 +122,11 @@ docker-backend-master:
docker-backend-release:
stage: docker
only:
refs:
- release
changes:
- .gitlab-ci.yml
- back/**/*
rules:
- if: $CI_COMMIT_BRANCH == "release"
changes:
- .gitlab-ci.yml
- back/**/*
before_script:
- docker info
- docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
......@@ -140,12 +140,11 @@ docker-backend-release:
docker-backend-develop:
stage: docker
only:
refs:
- develop
changes:
- .gitlab-ci.yml
- back/**/*
rules:
- if: $CI_COMMIT_BRANCH == "develop"
changes:
- .gitlab-ci.yml
- back/**/*
before_script:
- docker info
- docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
......@@ -203,13 +202,13 @@ deploy-master:
inherit:
default: false
variables: false
only:
- master
when: manual
rules:
- if: $CI_COMMIT_BRANCH == "master"
when: manual
variables:
NAMESPACE_ENV: "p01"
NAMESPACE_ENV: 'p01'
REPLICA_ENV: 1
IMG_TAG: "stable"
IMG_TAG: 'stable'
FS_GROUP: 100084
before_script:
- *replacement_scripts
......@@ -230,13 +229,13 @@ deploy-rec:
inherit:
default: false
variables: false
only:
- release
when: manual
rules:
- if: $CI_COMMIT_BRANCH == "release"
when: manual
variables:
NAMESPACE_ENV: "r01"
NAMESPACE_ENV: 'r01'
REPLICA_ENV: 1
IMG_TAG: "rc"
IMG_TAG: 'rc'
FS_GROUP: 100082
before_script:
- *replacement_scripts
......@@ -257,12 +256,12 @@ deploy-develop:
inherit:
default: false
variables: false
only:
- develop
rules:
- if: $CI_COMMIT_BRANCH == "develop"
variables:
NAMESPACE_ENV: "d01"
NAMESPACE_ENV: 'd01'
REPLICA_ENV: 1
IMG_TAG: "latest"
IMG_TAG: 'latest'
FS_GROUP: 100083
before_script:
- *replacement_scripts
......@@ -288,9 +287,9 @@ deploy-mr:
when: manual
allow_failure: true
variables:
NAMESPACE_ENV: "d01"
NAMESPACE_ENV: 'd01'
REPLICA_ENV: 1
IMG_TAG: "MR"
IMG_TAG: 'MR'
FS_GROUP: 100083
before_script:
- *replacement_scripts
......
......@@ -4,7 +4,7 @@
# *********************************************************************************************
ARG DEPENDENCY_PROXY=
FROM ${DEPENDENCY_PROXY}node:20.10-alpine AS builder
FROM ${DEPENDENCY_PROXY}node:22.1-alpine AS builder
WORKDIR /app
......@@ -22,7 +22,7 @@ RUN npm install \
# *********************************************************************************************
ARG DEPENDENCY_PROXY=
FROM ${DEPENDENCY_PROXY}node:20.10-alpine
FROM ${DEPENDENCY_PROXY}node:22.1-alpine
# Sets timezone
RUN apk add --no-cache tzdata
......
Source diff could not be displayed: it is too large. Options to address this: view the blob.
......@@ -19,30 +19,30 @@
"test:debug": "node --expose-gc --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand --logHeapUsage"
},
"dependencies": {
"@nestjs/axios": "^3.0.1",
"@nestjs/common": "^10.2.10",
"@nestjs/core": "^10.2.10",
"@nestjs/microservices": "^10.2.10",
"@nestjs/passport": "^10.0.2",
"@nestjs/platform-express": "^10.2.10",
"@nestjs/swagger": "^7.1.16",
"@nestjs/terminus": "^10.2.0",
"@nestjs/axios": "^3.0.2",
"@nestjs/common": "^10.3.8",
"@nestjs/core": "^10.3.8",
"@nestjs/microservices": "^10.3.8",
"@nestjs/passport": "^10.0.3",
"@nestjs/platform-express": "^10.3.8",
"@nestjs/swagger": "^7.3.1",
"@nestjs/terminus": "^10.2.3",
"@types/multer": "^1.4.11",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.0",
"dotenv": "^16.3.1",
"express-rate-limit": "^7.1.5",
"class-validator": "^0.14.1",
"dotenv": "^16.4.5",
"express-rate-limit": "^7.2.0",
"form-data": "^4.0.0",
"fs-extra": "^11.2.0",
"helmet": "^7.1.0",
"iconv-lite": "^0.6.3",
"joi": "^17.11.0",
"passport": "^0.6.0",
"joi": "^17.13.1",
"passport": "^0.7.0",
"passport-headerapikey": "^1.2.2",
"rxjs": "^7.8.1",
"swagger-ui-express": "^5.0.0",
"winston": "^3.11.0",
"winston-daily-rotate-file": "^4.7.1"
"winston": "^3.13.0",
"winston-daily-rotate-file": "^5.0.0"
},
"devDependencies": {
"@nestjs/cli": "^10.2.1",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment