Commit fab54df6 authored by Noel Alonso's avatar Noel Alonso
Browse files

Convierte beforeScript en un único bloque

parent 76687eff

.gitlab-ci.yml

+8 −17
Original line number Diff line number Diff line
@@ -81,11 +81,9 @@ variables: 
      then

        exit 0

      fi;

    - >

      mkdir -p sql;

      chmod -R 755 sql;

      docker network create test || true

    - >

      docker network create test || true;

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

        -p 5432:5432 \

        --network test \
@@ -94,8 +92,7 @@ variables: 
        -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 \

        "https://gitlab.com/api/v4/snippets/${OAUTH_DATABASE_STRUCTURE_TEST_SNIPPET_ID}/raw";
@@ -107,8 +104,7 @@ variables: 
        "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 \
@@ -138,16 +134,14 @@ variables: 
      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 \

        --network test \

        -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 \

        --network test \
@@ -156,8 +150,7 @@ variables: 
        -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 \

        "https://gitlab.com/api/v4/snippets/${API_DATABASE_STRUCTURE_TEST_SNIPPET_ID}/raw";
@@ -168,8 +161,7 @@ variables: 
      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 es6-1 \

        -p 9300:9300 \

        -p 9200:9200 \
@@ -187,8 +179,7 @@ variables: 
        -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};

      sleep 20;

      RETRIES=30;

      RESPONSE="";