Commit 1bae9d07 authored by Sergio Gonzalez Diaz's avatar Sergio Gonzalez Diaz
Browse files

Resolve conflicts merge request

parent b9855e60

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -145,5 +145,8 @@ dmypy.json 
# Cython debug symbols

cython_debug/



# Other

/tmp



# Sqlite

*.db

.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line 
# stages of the cicd pipeline

stages:

  - dependencies

  - build

  - test

  - unit_test

  - integ_test

  - dependencies

  - deploy

  - funct_test
@@ -12,6 +12,7 @@ stages: 
include: 

  - local: '/manifests/.gitlab-ci.yml'

  - local: '/src/monitoring/.gitlab-ci.yml'

  - local: '/src/centralizedattackdetector/.gitlab-ci.yml'

  - local: '/src/context/.gitlab-ci.yml'

  - local: '/src/device/.gitlab-ci.yml'

  - local: '/src/service/.gitlab-ci.yml'