Commit 69c40af2 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Define nombres correctos para checkear deploy pro

See merge request redmic-project/confluent/confluent-platform!4
parents baf327c7 29cfe4f9

.gitlab-ci.yml

+10 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ deploy-zookeeper-pro: 
    DEPLOY_DIR_NAME: zookeeper

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: zookeeper

    SERVICES_TO_CHECK: zk-1 zk-2 zk-3

    SERVICES_TO_CHECK: zookeeper_zk-1 zookeeper_zk-2 zookeeper_zk-3

    IMAGE_TAG: ${CONFLUENT_VERSION}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

  services:
@@ -151,7 +151,7 @@ deploy-kafka-pro: 
    DEPLOY_DIR_NAME: kafka

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: kafka

    SERVICES_TO_CHECK: kf-1 kf-2 kf-3

    SERVICES_TO_CHECK: kafka_kf-1 kafka_kf-2 kafka_kf-3

    IMAGE_TAG: ${CONFLUENT_VERSION}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

  services:
@@ -192,6 +192,7 @@ deploy-connect-pro: 
    DEPLOY_DIR_NAME: workers

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: connect

    SERVICES_TO_CHECK: workers_connect

    IMAGE_TAG: ${CONFLUENT_VERSION}

    COMPOSE_FILE: docker-compose.${SERVICE}.tmpl.yml:docker-compose.${SERVICE}.prod.yml

  services:
@@ -236,6 +237,7 @@ deploy-connector-supplier-pro: 
    DEPLOY_DIR_NAME: workers

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: connector-supplier

    SERVICES_TO_CHECK: workers_connector-supplier

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}/connector-supplier

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.${SERVICE}.tmpl.yml:docker-compose.${SERVICE}.prod.yml
@@ -280,6 +282,7 @@ deploy-schema-registry-pro: 
    DEPLOY_DIR_NAME: workers

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: schema-registry

    SERVICES_TO_CHECK: workers_schema-registry

    IMAGE_TAG: ${CONFLUENT_VERSION}

    COMPOSE_FILE: docker-compose.${SERVICE}.tmpl.yml:docker-compose.${SERVICE}.prod.yml

  services:
@@ -321,6 +324,7 @@ deploy-kafka-rest-pro: 
    DEPLOY_DIR_NAME: workers

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: kafka-rest

    SERVICES_TO_CHECK: workers_kafka-rest

    IMAGE_TAG: ${CONFLUENT_VERSION}

    COMPOSE_FILE: docker-compose.${SERVICE}.tmpl.yml:docker-compose.${SERVICE}.prod.yml

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}
@@ -365,6 +369,7 @@ deploy-kafka-manager-pro: 
    SSH_REMOTE: ${PRO_SSH_REMOTE}

    IMAGE_TAG: latest

    SERVICE: kafka-manager

    SERVICES_TO_CHECK: uis_kafka-manager

    COMPOSE_FILE: docker-compose.${SERVICE}.tmpl.yml:docker-compose.${SERVICE}.prod.yml

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  services:
@@ -409,6 +414,7 @@ deploy-kafka-topics-ui-pro: 
    SSH_REMOTE: ${PRO_SSH_REMOTE}

    IMAGE_TAG: latest

    SERVICE: kafka-topics-ui

    SERVICES_TO_CHECK: uis_kafka-topics-ui

    COMPOSE_FILE: docker-compose.${SERVICE}.tmpl.yml:docker-compose.${SERVICE}.prod.yml

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  services:
@@ -455,6 +461,7 @@ deploy-kafka-connect-ui-pro: 
    SSH_REMOTE: ${PRO_SSH_REMOTE}

    IMAGE_TAG: latest

    SERVICE: kafka-connect-ui

    SERVICES_TO_CHECK: uis_kafka-connect-ui

    COMPOSE_FILE: docker-compose.${SERVICE}.tmpl.yml:docker-compose.${SERVICE}.prod.yml

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  services:
@@ -501,6 +508,7 @@ deploy-schema-registry-ui-pro: 
    SSH_REMOTE: ${PRO_SSH_REMOTE}

    IMAGE_TAG: latest

    SERVICE: schema-registry-ui

    SERVICES_TO_CHECK: uis_schema-registry-ui

    COMPOSE_FILE: docker-compose.${SERVICE}.tmpl.yml:docker-compose.${SERVICE}.prod.yml

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  services: