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

Merge branch 'dev' into 'master' 

Cambia bloqueo de nodo por volumen NFS, actualiza

See merge request redmic-project/gitlab-runner!4
parents d5bece50 7a152fc9

.gitlab-ci.yml

+12 −0
Original line number Diff line number Diff line
@@ -9,6 +9,11 @@ stages: 
variables:

  PROJECT_PARENT_NAME: gitlab



.lock-job: &lock-job

  rules:

    - if: $CI

      when: never



.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}
@@ -27,6 +32,9 @@ variables: 
  environment:

    name: pro/${CI_PROJECT_NAME}



deploy-stable-branch-production:

  <<: *lock-job



.deploy-registrar:

  variables: &deploy-registrar-variables

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}-registrar
@@ -103,10 +111,12 @@ deploy-registrar-gitlab-com-stable-branch-development: 
deploy-registrar-grafcan-gitlab-es-stable-branch-production:

  extends: .deploy-registrar-grafcan-gitlab-es-production

  <<: *deploy-registrar-stable-branch

  <<: *lock-job



deploy-registrar-gitlab-com-stable-branch-production:

  extends: .deploy-registrar-gitlab-com-production

  <<: *deploy-registrar-stable-branch

  <<: *lock-job



.deploy-registrar-tag: &deploy-registrar-tag

  rules:
@@ -125,7 +135,9 @@ deploy-registrar-gitlab-com-tag-development: 
deploy-registrar-grafcan-gitlab-es-tag-production:

  extends: .deploy-registrar-grafcan-gitlab-es-production

  <<: *deploy-registrar-tag

  <<: *lock-job



deploy-registrar-gitlab-com-tag-production:

  extends: .deploy-registrar-gitlab-com-production

  <<: *deploy-registrar-tag

  <<: *lock-job

deploy/.env

+4 −1
Original line number Diff line number Diff line 
IMAGE_NAME=gitlab/gitlab-runner

IMAGE_TAG=alpine

PLACEMENT_CONSTRAINTS_NODE_HOSTNAME=hostname



CONFIG_FILE=/etc/gitlab-runner/config.toml

CI_SERVER_URL=https://gitlab.com/
@@ -36,6 +35,10 @@ CACHE_S3_BUCKET_NAME=gitlab-runner-cache 


CONFIG_VOL_NAME=gitlab-runner-config-vol

WORK_VOL_NAME=gitlab-runner-work-vol

VOL_TYPE=nfs4

VOL_ADDR=127.0.0.1

VOL_OPTIONS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14

VOL_DEVICE=:/gitlab-runner-config-vol/



GITLAB_NET_NAME=gitlab-net

GITLAB_NET_DRIVER=overlay

deploy/docker-compose.gitlab-runner-registrar.dev.yml

+5 −11
Original line number Diff line number Diff line 
version: '3.5'



services:

  gitlab-runner-registrar:

    deploy:

      placement:

        constraints:

          - node.hostname == ${PLACEMENT_CONSTRAINTS_NODE_HOSTNAME}

version: '3.8'



volumes:

  config-vol:

    name: ${CONFIG_VOL_NAME}



  work-vol:

    name: ${WORK_VOL_NAME}
 
    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: ${VOL_DEVICE}

deploy/docker-compose.gitlab-runner-registrar.tmpl.yml

+7 −3
Original line number Diff line number Diff line 
version: '3.5'

version: '3.8'



services:

  gitlab-runner-registrar:
@@ -55,10 +55,14 @@ services: 
      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.1}'

          memory: ${RESOURCES_LIMITS_MEMORY:-16M}

          memory: ${RESOURCES_LIMITS_MEMORY:-32M}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-4M}

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-16M}



volumes:

  work-vol:

    name: ${WORK_VOL_NAME}



networks:

  gitlab-net:

deploy/docker-compose.gitlab-runner.dev.yml

+5 −11
Original line number Diff line number Diff line 
version: '3.5'



services:

  gitlab-runner:

    deploy:

      placement:

        constraints:

          - node.hostname == ${PLACEMENT_CONSTRAINTS_NODE_HOSTNAME}

version: '3.8'



volumes:

  config-vol:

    name: ${CONFIG_VOL_NAME}



  work-vol:

    name: ${WORK_VOL_NAME}
 
    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: ${VOL_DEVICE}