Klagarge/MSE-CyberSec-DevSecOps
1
0
Fork 0
Code Issues Pull Requests Releases Activity

refactor(ci): merge some jobs on same stage

Browse Source 
Signed-off-by: Klagarge <remi@heredero.ch>
This commit is contained in:
Rémi Heredero
2025-04-15 22:00:26 +02:00
parent f6610ba524
commit 6c56c4cf3b
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@@ -6,11 +6,9 @@ default:
image: $DOCKER_IMAGE_TEST image: $DOCKER_IMAGE_TEST
stages: stages:
- build-docker-test - build-docker
- build-docker-app
- lint - lint
- test - test
- dast
.setup_env: &setup_env .setup_env: &setup_env
before_script: before_script:
@@ -59,7 +57,7 @@ pages:
# This job runs only when Dockerfile changes # This job runs only when Dockerfile changes
docker-build-test: docker-build-test:
image: docker:latest image: docker:latest
stage: build-docker-test stage: build-docker
services: services:
- docker:dind - docker:dind
script: script:
@@ -76,7 +74,7 @@ docker-build-test:
docker-build-app: docker-build-app:
image: docker:latest image: docker:latest
stage: build-docker-app stage: build-docker
services: services:
- docker:dind - docker:dind
script: script:
@@ -88,7 +86,7 @@ include:
- template: Jobs/SAST.gitlab-ci.yml - template: Jobs/SAST.gitlab-ci.yml
dast: dast:
stage: dast stage: test
image: ghcr.io/zaproxy/zaproxy:stable image: ghcr.io/zaproxy/zaproxy:stable
services: services:
- name: $DOCKER_IMAGE_APP - name: $DOCKER_IMAGE_APP