Commit 574783d9 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige detalles de despliegue y testeo 

Añade red de métricas.
Revisa variables de ci y compose.
Prueba a permitir ejecutar tests funcionales en cualquier runner.
parent 5fd3ccde

.gitlab-ci.yml

+3 −4
Original line number Diff line number Diff line
@@ -21,10 +21,11 @@ stages: 


variables:

  STACK: client

  WEB_BUILD_IMAGE: registry.gitlab.com/redmic-project/docker/web-build:latest

  WEB_BUILD_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/web-build

  WEB_BUILD_IMAGE_TAG: latest



.web-build:

  image: ${WEB_BUILD_IMAGE}

  image: ${WEB_BUILD_IMAGE_NAME}:${WEB_BUILD_IMAGE_TAG}

  cache:

    paths:

      - node_modules/
@@ -127,8 +128,6 @@ prepare-built-version: 
run-functional-tests:

  stage: test-deploy

  extends: .prepare-dependencies

  tags:

    - functional-testing

  script:

    - >

      grunt test-functional-local --serverUrl="https://${DEV_PUBLIC_HOSTNAME}" --user="${REDMIC_TEST_USER}"

deploy/docker-compose.tmpl.yml

+10 −5
Original line number Diff line number Diff line
@@ -4,16 +4,17 @@ services: 
  web:

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      - OAUTH_URL

      - OAUTH_CLIENT_SECRET

      - API_URL

      - PRODUCTION

      OAUTH_URL:

      OAUTH_CLIENT_SECRET:

      API_URL:

      PRODUCTION:

    networks:

      - traefik-net

      - metric-net

    healthcheck:

      test: wget --spider -q http://localhost:${PORT}

      interval: 30s

      timeout: 10s

      timeout: 30s

      retries: 3

      start_period: 1m

    deploy:
@@ -46,3 +47,7 @@ networks: 
  traefik-net:

    name: ${TRAEFIK_NET_NAME:-traefik-net}

    external: true



  metric-net:

    name: ${METRIC_NET_NAME:-metric-net}

    external: true