Commit 6a426e42 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'main' 

Pone al día configuración compose y ci

See merge request redmic-project/testing/selenium-nodes!3
parents f6a4f219 9d8ef427

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'

    file: '/deployment-service/docker-deploy.yml'



stages:

  - deploy

deploy/docker-compose.tmpl.yml→deploy/compose.yaml

+0 −2
Original line number Diff line number Diff line 
version: '3.9'



x-selenium-node-commons: &selenium-node-commons

  networks:

    selenium-net:

deploy/docker-compose.dev.yml

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
version: '3.9'

deploy/docker-compose.prod.yml

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
version: '3.9'