Commit 3a00807f authored by Noel Alonso's avatar Noel Alonso
Browse files

Añade propiedad y simplifica sintaxis

parent 2f603e26

.gitlab-ci.yml

+13 −11
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ stages: 
    DIND_IMAGE_NAME: docker

    DIND_IMAGE_TAG: dind

    DOCKER_HOST: tcp://docker:2375

    SPRING_DATASOURCE_URL: jdbc:postgresql://docker:5432/redmic?stringtype=unspecified

    ELASTIC_ADDRESSES: docker

    OAUTH_SERVER: http://docker:8081

    PROPERTY_USER_API: http://docker:8082
@@ -69,7 +70,7 @@ stages: 
    - >

      mkdir -p sql;

      chmod -R 755 sql;

      docker network create test;

      docker network create test

    - >

      docker run -d --rm --name postgres \

        -p 5432:5432 \
@@ -79,7 +80,7 @@ stages: 
        -e POSTGRES_USER \

        -e POSTGRES_PASSWORD \

        -v $(pwd)/sql:/sql \

        postgres:${POSTGRES_IMAGE_TAG};

        postgres:${POSTGRES_IMAGE_TAG}

    - >

      curl -s --header "PRIVATE-TOKEN: ${GITLAB_TOKEN_READ_API}" \

        -o sql/oauth_database_structure_test.sql \
@@ -92,7 +93,8 @@ stages: 
        "https://gitlab.com/api/v4/snippets/${USER_DATABASE_STRUCTURE_TEST_SNIPPET_ID}/raw";

      curl -s --header "PRIVATE-TOKEN: ${GITLAB_TOKEN_READ_API}" \

        -o sql/user_database_data_test.sql \

        "https://gitlab.com/api/v4/snippets/${USER_DATABASE_DATA_TEST_SNIPPET_ID}/raw";

        "https://gitlab.com/api/v4/snippets/${USER_DATABASE_DATA_TEST_SNIPPET_ID}/raw"

    - >

      RETRIES=10;

      until docker exec postgres psql -h localhost \

          -d redmic \
@@ -122,7 +124,7 @@ stages: 
      docker exec postgres psql -h localhost \

        -d redmic \

        -U ${POSTGRES_USER} \

        -f /sql/user_database_data_test.sql;

        -f /sql/user_database_data_test.sql

    - >

      docker run -d --rm --name oauth \

        -p 8081:8081 \
@@ -130,7 +132,7 @@ stages: 
        -e SPRING_PROFILES_ACTIVE=dev \

        -e SPRING_DATASOURCE_USERNAME=${USER_SPRING_DATASOURCE_USERNAME} \

        -e SPRING_DATASOURCE_PASSWORD=${USER_SPRING_DATASOURCE_PASSWORD} \

        ${OAUTH_IMAGE_NAME}:${OAUTH_IMAGE_TAG};

        ${OAUTH_IMAGE_NAME}:${OAUTH_IMAGE_TAG}

    - >

      docker run -d --rm --name user \

        -p 8082:8082 \
@@ -140,7 +142,7 @@ stages: 
        -e SPRING_DATASOURCE_PASSWORD=${USER_SPRING_DATASOURCE_PASSWORD} \

        -e OAUTH_CLIENT_ID \

        -e OAUTH_CLIENT_SECRET \

        ${USER_IMAGE_NAME}:${USER_IMAGE_TAG};

        ${USER_IMAGE_NAME}:${USER_IMAGE_TAG}

    - >

      curl -s --header "PRIVATE-TOKEN: ${GITLAB_TOKEN_READ_API}" \

        -o sql/api_database_structure_test.sql \
@@ -152,7 +154,7 @@ stages: 
      docker exec postgres psql -h localhost \

        -d redmic \

        -U ${POSTGRES_USER} \

        -c "ALTER ROLE ${SPRING_DATASOURCE_USERNAME} WITH PASSWORD '${SPRING_DATASOURCE_PASSWORD}'";

        -c "ALTER ROLE ${SPRING_DATASOURCE_USERNAME} WITH PASSWORD '${SPRING_DATASOURCE_PASSWORD}'"

    - >

      docker run -d --rm --name es-1 \

        -p 9300:9300 \
@@ -171,17 +173,17 @@ stages: 
        -e ES_DISCOVERY_ZEN_MINIMUM_MASTER_NODES \

        -e ES_DISCOVERY_ZEN_PING_UNICAST_HOSTS \

        -e ES_XPACK_SECURITY_ENABLED \

        ${ELASTICSEARCH_IMAGE_NAME}:${ELASTICSEARCH_IMAGE_TAG};

        ${ELASTICSEARCH_IMAGE_NAME}:${ELASTICSEARCH_IMAGE_TAG}

    - >

      HEALTH_CHECK_URL=${ELASTIC_HOSTS}:${ELASTIC_PORT}/_cat/health?h=status;

      RESPONSE="";

      until [ "$RESPONSE" = "green" ];

      do

        sleep 15;

        RESPONSE="$(curl -sS -u ${ELASTIC_USER}:${ELASTIC_USER_PASS} ${HEALTH_CHECK_URL} || :)";

        echo "Waiting for elasticsearch server, remaining attempts... Last output:";

        echo $RESPONSE;

        sleep 5;

      done;

      done

    - >

      docker login ${GITLAB_REGISTRY_HOST} -u ${CI_DEPLOY_USER} -p ${CI_DEPLOY_PASSWORD};

      docker run -d --rm --name schema-es \
@@ -190,7 +192,7 @@ stages: 
        -e ELASTIC_USER_PASS \

        -e ELASTIC_HOSTS \

        -e ELASTIC_SCHEMA_VERSION \

        ${SCHEMA_ES_IMAGE_NAME}:${SCHEMA_ES_IMAGE_TAG};

        ${SCHEMA_ES_IMAGE_NAME}:${SCHEMA_ES_IMAGE_TAG}

  after_script:

    - rm -rf .m2/repository/es

    - docker stop user oauth postgres es-1