Commit 8bc21fd5 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Aplica healthcheck a nodos, revisa y agrupa config

parent 87683168

deploy/.env

+0 −1
Original line number Diff line number Diff line
@@ -5,6 +5,5 @@ SE_SESSION_RETRY_INTERVAL=5 


SE_EVENT_BUS_PUBLISH_PORT=4442

SE_EVENT_BUS_SUBSCRIBE_PORT=4443

SE_NODE_MAX_CONCURRENT_SESSIONS=1



UI_AUTH=user:$apr1$md5password

deploy/docker-compose.tmpl.yml

+25 −14
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ services: 
      traefik-net:

    healthcheck:

      test: curl -sSL http://localhost:${SE_HUB_PORT}/wd/hub/status

      interval: ${HEALTHCHECK_INTERVAL:-30s}

      timeout: ${HEALTHCHECK_TIMEOUT:-15s}

      retries: ${HEALTHCHECK_RETRIES:-5}

      start_period: ${HEALTHCHECK_START_PERIOD:-1m}

      interval: ${SELENIUM_HUB_HEALTHCHECK_INTERVAL:-30s}

      timeout: ${SELENIUM_HUB_HEALTHCHECK_TIMEOUT:-15s}

      retries: ${SELENIUM_HUB_HEALTHCHECK_RETRIES:-5}

      start_period: ${SELENIUM_HUB_HEALTHCHECK_START_PERIOD:-1m}

    deploy:

      mode: replicated

      replicas: ${SELENIUM_HUB_REPLICAS:-1}
@@ -38,19 +38,31 @@ services: 
          cpus: '${SELENIUM_HUB_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${SELENIUM_HUB_RESOURCES_RESERVATIONS_MEMORY:-256M}



  selenium-chrome:

    image: ${SELENIUM_CHROME_IMAGE_NAME:-selenium/node-chrome}:${SELENIUM_CHROME_IMAGE_TAG:-latest}

    environment:

  x-selenium-node-environment: &selenium-node-environment

    SE_EVENT_BUS_HOST: ${SE_HUB_HOST}

    SE_EVENT_BUS_PUBLISH_PORT:

    SE_EVENT_BUS_SUBSCRIBE_PORT:

    SE_NODE_HOST: '{{.Service.Name}}'

      SE_NODE_MAX_CONCURRENT_SESSIONS:



  x-selenium-node-healthcheck: &selenium-node-healthcheck

    test: curl -sSL http://localhost:5555/status

    interval: ${SELENIUM_NODE_HEALTHCHECK_INTERVAL:-30s}

    timeout: ${SELENIUM_NODE_HEALTHCHECK_TIMEOUT:-15s}

    retries: ${SELENIUM_NODE_HEALTHCHECK_RETRIES:-5}

    start_period: ${SELENIUM_NODE_HEALTHCHECK_START_PERIOD:-1m}



  selenium-chrome:

    image: ${SELENIUM_CHROME_IMAGE_NAME:-selenium/node-chrome}:${SELENIUM_CHROME_IMAGE_TAG:-latest}

    environment:

      << : *selenium-node-environment

      SE_NODE_MAX_CONCURRENT_SESSIONS: ${SELENIUM_CHROME_MAX_CONCURRENT_SESSIONS:-1}

      SE_OPTS: ${SELENIUM_CHROME_SE_OPTS}

    networks:

      gitlab-net:

    volumes:

      - /dev/shm:/dev/shm

    healthcheck:

      << : *selenium-node-healthcheck

    deploy:

      mode: replicated

      replicas: ${SELENIUM_CHROME_REPLICAS:-1}
@@ -69,16 +81,15 @@ services: 
  selenium-firefox:

    image: ${SELENIUM_FIREFOX_IMAGE_NAME:-selenium/node-firefox}:${SELENIUM_FIREFOX_IMAGE_TAG:-latest}

    environment:

      SE_EVENT_BUS_HOST: ${SE_HUB_HOST}

      SE_EVENT_BUS_PUBLISH_PORT:

      SE_EVENT_BUS_SUBSCRIBE_PORT:

      SE_NODE_HOST: '{{.Service.Name}}'

      SE_NODE_MAX_CONCURRENT_SESSIONS:

      << : *selenium-node-environment

      SE_NODE_MAX_CONCURRENT_SESSIONS: ${SELENIUM_FIREFOX_MAX_CONCURRENT_SESSIONS:-1}

      SE_OPTS: ${SELENIUM_FIREFOX_SE_OPTS}

    networks:

      gitlab-net:

    volumes:

      - /dev/shm:/dev/shm

    healthcheck:

      << : *selenium-node-healthcheck

    deploy:

      mode: replicated

      replicas: ${SELENIUM_FIREFOX_REPLICAS:-1}