Commit 779dac4c authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza runner remoto y añade minio a red gitlab

parent 97bc3fc3

.gitlab-ci.yml

+12 −8
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ deploy-gitlab-runner-local: 
    COMPOSE_FILE: docker-compose.gitlab-runner-local.tmpl.yml:docker-compose.gitlab-runner-local.dev.yml

    CI_SERVER_URL: http://gitlab_gitlab-ce

    REGISTRATION_TOKEN: ${OAGDEV_GITLAB_TOKEN}

    RUNNER_NAME: OAGDev

    RUNNER_NAME: OAGDev local

    RUNNER_TAG_LIST: oagdev

    CACHE_S3_SERVER_ADDRESS: minio_minio

    CACHE_S3_ACCESS_KEY: ${MINIO_ACCESS_KEY}
@@ -99,16 +99,20 @@ deploy-gitlab-runner-remote: 
    SERVICES_TO_CHECK: gitlab_gitlab-runner-remote

    IMAGE_TAG: alpine

    COMPOSE_FILE: docker-compose.gitlab-runner-remote.tmpl.yml:docker-compose.gitlab-runner-remote.dev.yml

    GITLAB_URL: https://gitlab.com

    GITLAB_TOKEN: ${GITLABCOM_GITLAB_TOKEN}

    RUNNER_NAME: GitLab.com runner

    RUNNER_TAG_LIST: client,functional,oagdev

    CI_SERVER_URL: https://gitlab.com

    REGISTRATION_TOKEN: ${GITLABCOM_GITLAB_TOKEN}

    RUNNER_NAME: OAGDev remote

    RUNNER_TAG_LIST: oagdev

    CACHE_S3_SERVER_ADDRESS: minio_minio

    CACHE_S3_ACCESS_KEY: ${MINIO_ACCESS_KEY}

    CACHE_S3_SECRET_KEY: ${MINIO_SECRET_KEY}

  script:

    - create-nets.sh gitlab-net

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} GITLAB_URL=${GITLAB_URL}

      GITLAB_TOKEN=${GITLAB_TOKEN} MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY} MINIO_SECRET_KEY=${MINIO_SECRET_KEY}

      RUNNER_NAME="${RUNNER_NAME}" RUNNER_TAG_LIST=${RUNNER_TAG_LIST}

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} CI_SERVER_URL="${CI_SERVER_URL}"

      REGISTRATION_TOKEN="${REGISTRATION_TOKEN}" RUNNER_NAME="${RUNNER_NAME}" RUNNER_TAG_LIST="${RUNNER_TAG_LIST}"

      CACHE_S3_SERVER_ADDRESS="${CACHE_S3_SERVER_ADDRESS}" CACHE_S3_ACCESS_KEY="${MINIO_ACCESS_KEY}"

      CACHE_S3_SECRET_KEY="${MINIO_SECRET_KEY}"

  environment:

    name: dev/gitlab-runner-remote

  only:

gitlab-runner/.env

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ CONFIG_FILE=/etc/gitlab-runner/config.toml 
REGISTER_NON_INTERACTIVE=true

REGISTER_LOCKED=false

REGISTER_RUN_UNTAGGED=true

RUNNER_LIMIT=2

RUNNER_REQUEST_CONCURRENCY=2

RUNNER_OUTPUT_LIMIT=40960

RUNNER_EXECUTOR=docker

gitlab-runner/config-remote/config.toml

deleted100755 → 0
+0 −2
Original line number Diff line number Diff line 
concurrent = 2

check_interval = 10

gitlab-runner/docker-compose.gitlab-runner-local.tmpl.yml

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ services: 
      - REGISTER_RUN_UNTAGGED

      - RUNNER_NAME

      - RUNNER_TAG_LIST

      - RUNNER_LIMIT

      - RUNNER_REQUEST_CONCURRENCY

      - RUNNER_OUTPUT_LIMIT

      - RUNNER_EXECUTOR

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

+3 −3
Original line number Diff line number Diff line
@@ -10,10 +10,10 @@ services: 
        window: 1m

      resources:

        limits:

          cpus: '1'

          memory: 1G

          cpus: '0.5'

          memory: 128M

        reservations:

          memory: 820M

          memory: 103M



volumes:

  etc-vol: