From b33dd3a2606ec4e4ed635e50a1f53b00acbe2450 Mon Sep 17 00:00:00 2001
From: Alexis POYEN <apoyen@grandlyon.com>
Date: Fri, 2 Aug 2024 11:47:08 +0200
Subject: [PATCH] CI: migrate from only/except to rules
---
.gitlab-ci.yml | 91 +++++++++++++++++++++++++-------------------------
1 file changed, 45 insertions(+), 46 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5de202..1e4ec40 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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"
+ 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"
+ 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
--
GitLab