Commit 5a335555 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/testing/selenium-grid!2
parents 8a0d9541 d7e9f3f4

LICENSE

0 → 100644
+21 −0
Original line number Diff line number Diff line 
MIT License



Copyright (c) 2021 REDMIC Project / Testing



Permission is hereby granted, free of charge, to any person obtaining a copy

of this software and associated documentation files (the "Software"), to deal

in the Software without restriction, including without limitation the rights

to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

copies of the Software, and to permit persons to whom the Software is

furnished to do so, subject to the following conditions:



The above copyright notice and this permission notice shall be included in all

copies or substantial portions of the Software.



THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

SOFTWARE.

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

+38 −19
Original line number Diff line number Diff line 
version: '3.5'



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

  SE_EVENT_BUS_HOST: ${SE_HUB_HOST}

  SE_EVENT_BUS_PUBLISH_PORT:

  SE_EVENT_BUS_SUBSCRIBE_PORT:



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

  networks:

    selenium-net:

  volumes:

    - /dev/shm:/dev/shm

  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}



services:

  selenium-hub:

    image: ${SELENIUM_HUB_IMAGE_NAME:-selenium/hub}:${SELENIUM_HUB_IMAGE_TAG:-latest}
@@ -10,8 +27,17 @@ services: 
      SE_SESSION_RETRY_INTERVAL:

      SE_OPTS: ${SELENIUM_HUB_SE_OPTS}

    networks:

      selenium-net:

        aliases:

          - ${SE_HUB_HOST}

      gitlab-net:

      traefik-net:

    healthcheck:

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

      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}
@@ -27,7 +53,7 @@ services: 
      resources:

        limits:

          cpus: '${SELENIUM_HUB_RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${SELENIUM_HUB_RESOURCES_LIMITS_MEMORY:-512M}

          memory: ${SELENIUM_HUB_RESOURCES_LIMITS_MEMORY:-1G}

        reservations:

          cpus: '${SELENIUM_HUB_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${SELENIUM_HUB_RESOURCES_RESERVATIONS_MEMORY:-256M}
@@ -35,16 +61,10 @@ services: 
  selenium-chrome:

    image: ${SELENIUM_CHROME_IMAGE_NAME:-selenium/node-chrome}:${SELENIUM_CHROME_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_CHROME_MAX_CONCURRENT_SESSIONS:-1}

      SE_OPTS: ${SELENIUM_CHROME_SE_OPTS}

    networks:

      gitlab-net:

    volumes:

      - /dev/shm:/dev/shm

    << : *selenium-node-commons

    deploy:

      mode: replicated

      replicas: ${SELENIUM_CHROME_REPLICAS:-1}
@@ -63,16 +83,10 @@ 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

    << : *selenium-node-commons

    deploy:

      mode: replicated

      replicas: ${SELENIUM_FIREFOX_REPLICAS:-1}
@@ -89,6 +103,11 @@ services: 
          memory: ${SELENIUM_FIREFOX_RESOURCES_RESERVATIONS_MEMORY:-512M}



networks:

  selenium-net:

    name: ${SELENIUM_NET_NAME:-selenium-net}

    driver: ${SELENIUM_NET_DRIVER:-overlay}

    attachable: ${SELENIUM_NET_ATTACHABLE:-true}



  gitlab-net:

    name: ${GITLAB_NET_NAME:-gitlab-net}

    driver: ${GITLAB_NET_DRIVER:-overlay}

README.md

+1 −1

File changed.

Contains only whitespace changes.